4014 Commits

Author SHA1 Message Date
avolkov 7f47d0adf4 Cargo menu cleanup: MENU_STATE.CurState is now 0-based; split drawing into functions; added symbolic positioning constants; moved colors to colors.h; not relying on MENU_STATE.Initialized
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3427 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-12 07:50:45 +00:00
avolkov 4fbe2c2477 Cleanup of game options menus: not reusing MENU_STATE anymore; clear sub-menu functions; not relying on MENU_STATE.Initialized; clearer Load from Main menu (not perfect); clearer CurrentActivity flags manipulation
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3426 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-12 04:45:15 +00:00
avolkov 7365b09a95 Save/load UI cleanup: own MENU_STATE; MENU_STATE hacks removed; fully redrawing the summary every time for simplicity and better color-matching
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3425 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-12 00:34:07 +00:00
Meep-Eep 3d68c686ea Correct sentence.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3424 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-11 23:19:36 +00:00
avolkov 2057e5e2bd Full screen transitions do not need to specify a rect
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3423 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-11 18:46:09 +00:00
avolkov c984f9c48c Removed a comment that is not relevant anymore
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3422 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-11 18:21:52 +00:00
avolkov c9d6ee1bda Cleanup: remove MENU_STATE.flash_task completely
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3421 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-10 21:44:21 +00:00
avolkov f6a1b6973b Remove pSolarSysState->MenuState completely
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3420 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-10 21:34:12 +00:00
avolkov c0eb61d875 Dead variable MENU_STATE.MenuRepeatDelay removed
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3419 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-10 21:01:05 +00:00
avolkov bce2dc0933 Remove the last dependencies on pSolarSysState->MenuState.Initialized; replaced with SOLARSYS_STATE.InOrbit
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3418 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-10 20:52:20 +00:00
avolkov 0ff2a62648 Do not make users wait for fades when closing the game
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3417 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-10 19:03:57 +00:00
avolkov 5415199305 Cleanup: TaskContext removed; the only place using it now has an own context
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3416 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-10 09:41:31 +00:00
avolkov 212f9a68ea Keep 'Entering planetary orbit...' screen on while a planet is zooming in
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3415 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-10 09:26:57 +00:00
avolkov 70e7ae8204 Remove one more dependance on pSolarSysState->MenuState.Initialized
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3414 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-10 09:11:44 +00:00
avolkov 742f64ac4c Fixes devices menu after loading directly into planet orbit, broken by r3393 (planet rotation task removal)
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3413 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-10 08:50:35 +00:00
avolkov 1d508c0b4c Screen fade task retired; also replace XFormColorMap() hacks with a separate new call FadeScreen()
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3412 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-10 08:23:51 +00:00
avolkov 2d13f9a9d7 Music fade task retired; also absolve audio drivers from managing the stream decoder task
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3411 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-10 04:38:35 +00:00
avolkov 4dfdd607ad Credits task retired; credits drawing is now a callback of DoInput
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3410 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-09 23:43:40 +00:00
avolkov a8aaba1485 Cleaner use of background/foreground colors in presentations
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3409 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-08 22:59:23 +00:00
avolkov 63f66cf010 Use SaveContextFrame() where appropriate
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3408 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-08 22:46:15 +00:00
avolkov 939fc2e5db Better context drawing origin semantics; also chaser fix for foreground frame hotspot left broken in r3401
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3407 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-08 21:50:16 +00:00
avolkov 4ad67018fa Change GetContextClipRect() semantics so that a valid rect is always filled in; added some gfx predicate functions, not used everywhere yet
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3406 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-08 20:58:18 +00:00
avolkov 5976a133dd Some graphics primitives scaling comments and consistency edits
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3405 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-08 19:11:29 +00:00
avolkov 2e3dfee3cd Dead batching flags removed
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3404 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-08 17:01:38 +00:00
avolkov 3c63c20371 Dead context clipping flag removed
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3403 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-08 16:55:56 +00:00
avolkov a8ea62eeb0 Uncouple text drawing from batching
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3402 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-08 16:37:52 +00:00
avolkov fb48357a54 Make context cliprect + foreground frame hotspot semantics actually sane; do not hack _CurFramePtr->HotSpot
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3401 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-07 23:23:46 +00:00
Meep-Eep 723d4ec110 Expand 'sf.net'; list another web page.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3400 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-07 22:01:26 +00:00
Meep-Eep 7334ca7eea A few cleanups.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3399 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-07 21:56:24 +00:00
Meep-Eep 6e83a1df99 Fix harmless compilation warning.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3398 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-07 21:54:22 +00:00
Meep-Eep 9940281f1a LockMutext(GraphicsLock) before SetContext()
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3397 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-07 21:42:59 +00:00
Meep-Eep d93037c045 Updated.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3396 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-07 19:56:32 +00:00
avolkov 8e1875fdb6 Hangar animation is now a DoInput callback; now works in Game menu too
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3395 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-05 23:27:06 +00:00
avolkov 890b844edb Fixed planet blinking when exiting scan; bug #799
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3394 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-05 22:38:37 +00:00
avolkov e151b933f8 Planet rotation task retired; this introduces a DoInput frame callback and lays the foundation for the removal of credits task
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3393 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-05 22:15:23 +00:00
Meep-Eep 8b61f282d0 Typo.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3392 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-05 17:04:20 +00:00
avolkov 240dc2d78d Split planet rotation code into sensible functions in preparation for dethreading; some cleanups
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3391 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-05 02:26:29 +00:00
avolkov b98aff0d7f Planet surface and sphere cleanup: names, casts, horrible code; some comments
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3390 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-04 20:38:52 +00:00
avolkov c3f408a9b8 Restore arrow menu sounds after editing a control set name; bug #1066
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3389 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-04 18:24:15 +00:00
avolkov f59b1f9e8e Cleanup of key repeat set functions usage
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3388 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-04 00:12:12 +00:00
avolkov af0c63d3dc Small solar system menu fix
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3387 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-03 22:38:07 +00:00
avolkov 75e3ab16e6 Small ipdisp clarification
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3386 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-03 22:28:40 +00:00
avolkov 2cba7e4942 Cleanup: use IP location<->display conversion functions; some ipdisp clarifications
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3385 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-03 21:36:32 +00:00
avolkov b0bdc9e7b3 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
2009-12-03 03:54:12 +00:00
avolkov 11ae7a4334 Remove more draw_sys_flags via a refactoring of system view saving code; this will lead to a simplification of system transitions
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3383 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-01 23:23:09 +00:00
avolkov 3453867e92 Cleanup: unused graphics calls removed
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3382 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-01 21:48:38 +00:00
avolkov d7e628a7c2 Removal of unused DRAW_PLANETS and DRAW_ORBITS flags
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3381 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-01 20:52:44 +00:00
avolkov e90739a1d2 Smooth solar system zoom experiment fixed, uncomment #define SMOOTH_SYSTEM_ZOOM to try; some cleanups
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3380 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-01 20:43:33 +00:00
avolkov 9562043687 Cleanup of some of the pSolarSysState references
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3379 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-12-01 17:18:26 +00:00
avolkov d050f79cb6 Split DoFlagshipCommands() into separate menu functions for IP, Orbital and Hyperspace; this allowed for some solarsys and manifest menu cleanups; temporary pBaseDesc setups removed; some invariant tests removed; some code moved around to more appropriate places
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3378 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-11-30 21:57:13 +00:00