c9c3fe6eff
The code is not ready for this assertion.
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3774 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-02-25 19:33:43 +00:00
f5bb4c0c57
Some functions for activities.
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3773 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-02-24 21:00:39 +00:00
947767d944
Add setSegue(), getSegue().
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3772 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-02-24 19:52:10 +00:00
d085d08fa6
Literacy.
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3771 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-02-18 20:26:58 +00:00
c7c8916c2e
Consolidate duplicate screen init functions
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3770 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-02-13 01:10:40 +00:00
dfeaf56b02
Change return type of IsVelocityZero() to reflect the real return value
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3769 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-02-13 01:08:15 +00:00
917cab1b7c
Do not leak MenuState.CurFrame in RestartMenu; bug #1156
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3768 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-02-12 20:46:54 +00:00
38acc94022
Cleanup mounted dirs upon exit; bug #1149 ; thanks to Louis Delacroix
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3767 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-02-12 20:18:33 +00:00
91ce0e9898
Remove dated SCREEN_DRAWABLE logic to allow for Screen FRAME cleanup; bug #1149
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3766 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-02-12 20:01:20 +00:00
2cf7861674
Cleanup colormaps upon exiting the game; bug #1149
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3765 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-02-12 19:10:15 +00:00
f87f956cdf
Free the state-file data upon delete, from Louis Delacroix
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3764 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-02-12 02:41:11 +00:00
f3af42e618
Const-correctness for STRING resources; bug #1155 ; in part from Louis Delacroix
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3763 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-02-12 02:32:30 +00:00
714d001383
Enable DEBUG_DCQ_THREADS for msvc Debug builds by default
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3762 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-02-12 01:07:17 +00:00
6be6491c05
Quantum-erase GraphicsLock; Some changes needed to accomplish this:
...
* comm/trackplayer Callbacks are now queued instead of asynchronously called on the stream decoder thread
* libs/callback now guards the list with a mutex (called from different threads)
* only one thread (Starcon2Main) is allowed to queue draw commands right now; a sanity check is in place (define DEBUG_DCQ_THREADS)
Fixes: Alarms and Callbacks are used for more than just Netplay, reflect this.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3761 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-02-11 23:41:06 +00:00
8e8b812cb7
Only build with Ogg Vorbis if so specified.
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3760 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-02-06 17:43:46 +00:00
8aab2ae592
Split debug key function into sync and async parts (wrt the game logic thread), paving the way for GraphicsLock and GameClock lock removal
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3759 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-01-29 20:18:50 +00:00
f1a1ca2075
Corrections, updates.
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3758 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-01-29 18:35:35 +00:00
e4902fa2c3
Generalised some functions.
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3757 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-01-29 15:43:55 +00:00
bf0d86fcf3
Ships to buy didn't flash in the shipyard in PC menu mode.
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3756 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-01-28 21:10:41 +00:00
f74e575841
Fix for src\uqm\outfit.c(569) : warning C4146: unary minus operator applied to unsigned type, result still unsigned
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3755 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-01-28 19:47:22 +00:00
d6738ca687
Hibernate, not Sleep.
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3754 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-01-28 19:30:52 +00:00
18a399eea7
Fixes 3d planet lighting map calculations, bug #1151 , from Louis Delacroix
...
Relative lighting factor in GenerateLightMap() should now be reexamined to determine what algorithm works best.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3753 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-01-28 19:08:30 +00:00
8abe057e2a
Add/Remove fuel 10 at a time with PageUp/PageDown, from from Scott A. Colcord, Nic.
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3752 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-01-28 19:02:33 +00:00
3a54081af8
Some cleanups and bug fixes.
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3751 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-01-28 17:07:35 +00:00
d8d201ee54
Annihigate flash thread.
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3750 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-01-27 23:29:03 +00:00
20e2ea337f
Switch SetFlashRect() to the new flash code, as the next step towards getting rid of threads. Also some small cleanups.
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3749 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-01-23 20:14:45 +00:00
ca5ead9d65
--unix_depend_format was there before after all. Putting it back.
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3748 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-01-15 20:37:31 +00:00
fc18eebd15
Add C++ support to the build system, from Scott A. Colcord.
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3747 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-01-15 20:01:20 +00:00
e8cfeed54b
No bitfields here.
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3746 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-01-14 20:10:11 +00:00
65f46689f3
Fix leaked TFB_Image.FilledImg
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3744 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-01-13 17:16:23 +00:00
c16883fce4
Cleanup: purge the DCQ of the data it owns on the way out of the program.
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3743 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-01-10 07:20:33 +00:00
3d32d8ad2c
A few comments.
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3742 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-01-08 14:15:05 +00:00
3da5e55c1c
Fix flashing when pressing the 'spin ship' button on an empty slot
...
or the flag ship.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3741 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-01-08 13:49:39 +00:00
a86e795d9e
Locking fix. Also change the locking behaviour of DMS_SetMode, to avoid repeated locks/unlocks and make the code invoking this function a bit cleaner.
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3740 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-01-08 12:58:38 +00:00
06d61df3d3
Fix uninitialized img->dirty in TFB_DrawImage_New(), from Louis Delacroix
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3739 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-01-08 04:04:51 +00:00
779b955501
fix out of bounds (off by 1) access of vcontrol_parse_state::line
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3738 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-01-08 04:01:44 +00:00
d62c5bfda3
More DoModifyShips() cleanups. That should be all for now.
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3737 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-01-08 01:12:22 +00:00
62e1200a05
Fix uninitialized RECT member as per Louis Delacroix
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3736 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-01-04 04:35:29 +00:00
580d62c3a3
More cleanups. Among other things, MENU_STATE.flash_rect0 is no longer used.
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3734 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-01-01 20:08:51 +00:00
7ad1112e61
More cleanups.
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3733 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-01-01 19:02:27 +00:00
dfd2cf0840
More cleanups.
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3732 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-01-01 17:36:50 +00:00
c65fc65f2b
Fix for my earlier cleanup...
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3731 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-01-01 16:47:49 +00:00
010f3507d0
More DoModifyShips() cleanups.
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3730 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-01-01 16:41:38 +00:00
751427d909
More cleanups of DoModifyShips. We'll get to something comprehendible eventually.
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3729 8092fc87-c524-0410-9efc-e669fe64eaf9
2012-01-01 01:59:12 +00:00
deee6426a3
A few more comments.
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3728 8092fc87-c524-0410-9efc-e669fe64eaf9
2011-12-31 02:54:57 +00:00
3efe540ee4
Clean up DoModifyShips a bit more.
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3727 8092fc87-c524-0410-9efc-e669fe64eaf9
2011-12-31 02:40:15 +00:00
fca250aaa1
Remove dead code; consistent use of 'extern'.
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3726 8092fc87-c524-0410-9efc-e669fe64eaf9
2011-12-31 01:58:11 +00:00
9815ef5737
Simplify.
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3725 8092fc87-c524-0410-9efc-e669fe64eaf9
2011-12-31 01:46:56 +00:00
85c3c334aa
Some cleaning up of DoModifyShips(). More to come.
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3724 8092fc87-c524-0410-9efc-e669fe64eaf9
2011-12-31 01:39:02 +00:00
85b97fb673
Reverting. This one is not ready yet.
...
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3723 8092fc87-c524-0410-9efc-e669fe64eaf9
2011-12-30 01:37:21 +00:00
Meep-Eep
avolkov
mcmartin