4014 Commits

Author SHA1 Message Date
avolkov 9e1b5ac5c4 Fixes Pkunk crash bug due to a static variable; also moves the static data to owning STARSHIP
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3277 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-11-05 04:09:55 +00:00
avolkov 164b42bd66 Micro version bump to 0.6.7
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3276 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-11-05 04:02:50 +00:00
avolkov b9d1b379df Final GOOD_GUY/BAD_GUY cleanup, now enumerated
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3275 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-11-05 03:27:36 +00:00
avolkov 51751b3858 Battle & ship code cleanup: GOOD_GUY/BAD_GUY flags removed from Hyperspace; some comments
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3274 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-11-04 23:51:26 +00:00
avolkov 6a822abc49 Battle & ship code cleanup: GOOD_GUY/BAD_GUY flags replaced with playerNr; these flags are not set in SHIP_INFO anymore; STARSHIP.which_side removed (fully replaced by playerNr)
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3273 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-11-04 21:42:39 +00:00
avolkov 5b58d27b26 Cleanup of lander: ELEMENT.playerNr introduced; GOOD_GUY/BAD_GUY removed
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3272 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-11-02 08:04:51 +00:00
avolkov 79fcbff236 Cleanup of IP display code: GOOD_GUY/BAD_GUY removed; several bugs removed (some previously fixed); special-case hack code moved where it belongs; some comments
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3271 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-11-02 05:23:06 +00:00
Meep-Eep 913aa4ffa6 Cleanups.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3270 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-31 15:51:31 +00:00
Meep-Eep 5320aeeb7d Second argument of SetFlashRect is now always 0. This commit removes that
argument.
Also some small cleanups.



git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3269 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-31 15:37:46 +00:00
Meep-Eep 6e4534b7bd Cleanups.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3268 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-31 14:42:02 +00:00
avolkov 06f1e11b33 Battle & ship code cleanup: better name 'allied_state' for FLEET_INFO.ship_flags
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3267 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-31 01:17:53 +00:00
avolkov a56719420e Battle & ship code cleanup: Switch to playerNr instead of GOOD_GUY/BAD_GUY in ship status code
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3266 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-31 00:57:09 +00:00
avolkov 415eec4efb Battle & ship code cleanup: Destruction of WHICH_SIDE(); removal of turn_wait abuse in new_ship()
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3265 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-30 22:33:09 +00:00
avolkov 6304f5e884 Battle & ship code cleanup: Removed the global var cur_player; control flags propagated forward
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3264 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-30 19:27:41 +00:00
avolkov 0919ab84fe Battle & ship code cleanup: Removed the now invariant var CyborgDescPtr
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3263 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-29 22:32:22 +00:00
avolkov 60d320f09b Fixed Melee menu timeouts after Load team and NET dialogs; bug #1067
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3262 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-29 00:40:35 +00:00
avolkov 8d595b300e Fix main menu inactivity timeout broken by r3164; random cleanups
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3261 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-28 22:58:50 +00:00
Meep-Eep 66b0fdb593 Remove empty struct.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3260 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-28 07:29:29 +00:00
avolkov d8daf03969 Do not try an orbital insertion when the ship is not moving; bug #648
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3259 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-28 05:00:07 +00:00
avolkov c5ef5f4bad Updated MSVC6 project file for message box rewrite; left out in r3252
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3258 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-27 18:41:12 +00:00
avolkov db321c4eb7 Really kill mouse_err.c which refused to die in r2809
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3257 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-27 16:41:27 +00:00
avolkov 7d276bc796 Revert graphics settings entirely when a mode switch fails; bug #1056
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3256 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-26 20:59:14 +00:00
avolkov 7c75c31291 Add pauses to the beginning and end of 'several hours later' track to emphasize the time passage and give the scene a more natural feel
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3255 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-26 19:49:18 +00:00
avolkov ce29d6a7a6 Fixed the Syreen 'several hours later' timing; bug #1011
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3254 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-26 18:32:48 +00:00
avolkov 4cf3f2b292 Do not make alien comm code play each track individually when there are events interspersed, it causes subtitle blinking, and there is no need for this
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3253 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-26 18:25:56 +00:00
avolkov 90945cf8df Native message box on MacOSX; platform-specific separation of box drivers
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3252 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-25 22:21:08 +00:00
Meep-Eep 9ef9d69622 A few commas, to help Alex read.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3251 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-25 01:17:36 +00:00
Meep-Eep b1eedecb32 Switch main menu to the new threadless flashing code.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3250 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-25 01:12:19 +00:00
Meep-Eep c02ca9e000 Improvements to flashing code. Overlays work right too, now.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3249 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-25 01:11:41 +00:00
avolkov a82b17e1c9 Asm scaler fixes: restrict RGB15_to_YUV operand to a register, but leave gcc more available regs; fixes scaler problems in MacOSX; Also, properly inform gcc of clobbered condition code reg
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3248 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-25 01:01:45 +00:00
avolkov 11ffd2ac61 We cannot rely on SDL_DisplayFormatAlpha(). Our code assumed things which may not be true on a Mac w/ SDL 1.2.14. This fix is also applicable to all platforms
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3247 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-24 22:22:02 +00:00
avolkov 68ebcaf54e Don't try using pkgconfig to detect libs on Mac OSX; pkgconfig is not there
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3246 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-24 21:53:05 +00:00
Meep-Eep 2db40c9528 Only need to put the version number on the restart screen once.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3245 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-24 21:11:40 +00:00
Meep-Eep 6828498658 Some more cleanups; move color definitions to colors.h.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3244 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-24 20:07:03 +00:00
Meep-Eep e90b6c5537 Updated.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3243 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-24 19:36:24 +00:00
Meep-Eep 5036ba075e Fix SDL, libmikmod, and pthreads detection.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3242 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-24 19:32:36 +00:00
Meep-Eep 241d95d2c1 Cleanups, add have_command.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3241 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-24 19:31:55 +00:00
Meep-Eep 595bf1e5e0 Detection of libmikmod requires detection of libmikmod-config.
Same for SDL and pthread.



git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3240 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-24 17:57:14 +00:00
Meep-Eep 005cbd6656 Even more fixes.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3239 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-24 17:56:13 +00:00
Meep-Eep bb2513fc06 More fixes.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3238 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-24 17:50:49 +00:00
Meep-Eep 4eb191e859 A few corrections.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3237 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-24 17:44:34 +00:00
avolkov 2362c376a4 Scope fixes: 0-init scope data; do not put critical calls into an assert() ;-)
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3236 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-24 05:37:41 +00:00
Meep-Eep 6774ad2a9b Make DoPopupWindow() work over faded out screens.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3235 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-23 19:51:33 +00:00
avolkov 62c7422918 Cleanup of options processing: parse all options at the very first thing we do, so do not have to screw with optind; fixes failures when running with no args on mingw
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3234 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-21 20:21:25 +00:00
Meep-Eep cf7fd70c67 Redefining "absurd". Also small cleanup.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3233 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-21 16:49:26 +00:00
avolkov c6de2bece5 Sndlib cleanup: do not expose internals; some dead stuff removed; a few bugs fixed; stream decoder reorg; some memory optimizations; use intptr_t for tags (64-bit cleanliness)
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3232 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-19 19:13:24 +00:00
avolkov 50f95f5856 This debug print should not have made it in, and now removed
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3231 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-19 10:32:15 +00:00
avolkov 621e8c5a7f Make HRealloc() check the return the same way HMalloc() does
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3230 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-19 10:09:33 +00:00
mcmartin 20ae0eb3fb When reading options, perform more thorough type-checking. This should solve a crash some modders found when modifying menu.key.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3229 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-19 01:02:22 +00:00
avolkov ac3b01ce12 Trackplayer rewrite; fixes several obscure bugs; SpliceTrack() still a mess
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3228 8092fc87-c524-0410-9efc-e669fe64eaf9
2009-10-18 16:53:27 +00:00