Refactored solar system drawing, now using a straightforward approach; unexpected function side-effects mostly removed (that model/view thing); some cleanups

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3384 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2009-12-03 03:54:12 +00:00
parent 11ae7a4334
commit b0bdc9e7b3
2 changed files with 630 additions and 621 deletions
+8 -2
View File
@@ -163,6 +163,10 @@ struct solarsys_state
MENU_STATE MenuState; MENU_STATE MenuState;
COUNT WaitIntersect; COUNT WaitIntersect;
// Planet/moon number with which the flagship should not collide
// For example, if the player just left the planet or inner system
// If set to (COUNT)~0, all planet collisions are disabled until
// the flagship stops intersecting with all planets.
PLANET_DESC SunDesc[MAX_SUNS]; PLANET_DESC SunDesc[MAX_SUNS];
PLANET_DESC PlanetDesc[MAX_PLANETS]; PLANET_DESC PlanetDesc[MAX_PLANETS];
// Description of the planets in the system. // Description of the planets in the system.
@@ -175,8 +179,10 @@ struct solarsys_state
// as its argument, and overwritten by subsequent calls. // as its argument, and overwritten by subsequent calls.
PLANET_DESC *pBaseDesc; PLANET_DESC *pBaseDesc;
PLANET_DESC *pOrbitalDesc; PLANET_DESC *pOrbitalDesc;
// Points into PlanetDesc or MoonDesc to the planet currently // In orbit: points into PlanetDesc or MoonDesc to the planet
// orbiting. // currently orbiting.
// In inner system: points into PlanetDesc to the planet whose
// inner system the ship is inside
SIZE FirstPlanetIndex, LastPlanetIndex; SIZE FirstPlanetIndex, LastPlanetIndex;
// The planets get sorted on their image.origin.y value. // The planets get sorted on their image.origin.y value.
// PlanetDesc[FirstPlanetIndex] is the planet with the lowest // PlanetDesc[FirstPlanetIndex] is the planet with the lowest
File diff suppressed because it is too large Load Diff