Commit: ccd5555275056c3b0bd08b632ad7f444628613ee Trac URL: http://developer.wz2100.net/changeset/ccd5555275056c3b0bd08b632ad7f444628613ee
Author: Buginator <bugina...@gna.org> Date: Sat Jul 31 21:49:44 2010 +0000 Remove a (MSVC only) debug() line that spammed way too much. git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2...@11321 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit a2a11fccd74485f76dbb098c0bb73de6cc0bd708) lib/framework/string_ext.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/framework/string_ext.h b/lib/framework/string_ext.h index eb03537..a120c6d 100644 --- a/lib/framework/string_ext.h +++ b/lib/framework/string_ext.h @@ -50,7 +50,7 @@ static inline char *strdup2(const char *s, char *fileName, int line) (void)debug_MEMCHKOFF(); result = (char*)malloc(strlen(s) + 1); (void)debug_MEMCHKON(); - debug(LOG_NEVER, "allocator toggled in %s %d",fileName,line); + if (result == (char*)0) return (char*)0; strcpy(result, s); ------------------------- Commit: bc24cd6a2227b964c4af0c8b74742d2f60763f75 Trac URL: http://developer.wz2100.net/changeset/bc24cd6a2227b964c4af0c8b74742d2f60763f75 Author: Buginator <bugina...@gna.org> Date: Tue Aug 17 23:27:14 2010 +0000 Try to make the password box more idiot proof. git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2...@11492 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit 41b6578b911a263cf566ec9db42476215b2ccfe7) src/multiint.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) ------------------------- Commit: dd87aaf864fc0690c4bb524f086a20dde5b7eefa Trac URL: http://developer.wz2100.net/changeset/dd87aaf864fc0690c4bb524f086a20dde5b7eefa Author: Buginator <bugina...@gna.org> Date: Sat Aug 21 00:24:36 2010 +0000 Try to continue loading if we detected a bad ID. fixes ticket:2100 git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2...@11500 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit bef4eb0f8d5312961ac6b110ece6552fe1098e51) src/game.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) ------------------------- Commit: a4cb1d0c46549e9bfb412cc8c01fe092efabcd3a Trac URL: http://developer.wz2100.net/changeset/a4cb1d0c46549e9bfb412cc8c01fe092efabcd3a Author: Buginator <bugina...@gna.org> Date: Sat Aug 21 00:29:15 2010 +0000 Move back ToggleSensorDisplay to a debug function, and don't allow it in MP games. git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2...@11501 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit 9ee9ed52dd204ee217741ccfcdf49d2386124e57) src/keybind.c | 10 ++++++++++ src/keymap.c | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) ------------------------- Commit: 6539a3b19e41d43b51e8f63e3b887f52a8706a3a Trac URL: http://developer.wz2100.net/changeset/6539a3b19e41d43b51e8f63e3b887f52a8706a3a Author: Buginator <bugina...@gna.org> Date: Tue Aug 24 00:25:14 2010 +0000 Change back kf_ToggleSensorDisplay to KEYMAP_ASSIGNABLE (however, we still won't allow it in MP games) git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2...@11531 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit e85d0deb556eb00dc17db5bc6d3886fb02bde2fc) src/keymap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ------------------------- Commit: f4c3d7ec8ef6b6c37ddbccc2ea03ccee081abaef Trac URL: http://developer.wz2100.net/changeset/f4c3d7ec8ef6b6c37ddbccc2ea03ccee081abaef Author: Buginator <bugina...@gna.org> Date: Sat Aug 28 03:58:21 2010 +0000 Change ASCII_NEWLINE from '@' to '`' This enables people to use "@" in chat. git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2...@11545 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit 10217901eb10fc652c3c8eeb2eba2f519b1f5b0f) lib/ivis_common/textdraw.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/ivis_common/textdraw.h b/lib/ivis_common/textdraw.h index 1d7bf55..1438d65 100644 --- a/lib/ivis_common/textdraw.h +++ b/lib/ivis_common/textdraw.h @@ -51,7 +51,7 @@ extern unsigned int iV_GetTextHeight(const char* string); extern void iV_SetTextColour(PIELIGHT colour); #define ASCII_SPACE (32) -#define ASCII_NEWLINE ('@') +#define ASCII_NEWLINE ('`') #define ASCII_COLOURMODE ('#') #define TEXT_UTF8_SPACE " " ------------------------- Commit: 2bb1a51bc13a75fa1beed39f59754de100333e59 Trac URL: http://developer.wz2100.net/changeset/2bb1a51bc13a75fa1beed39f59754de100333e59 Author: Buginator <bugina...@gna.org> Date: Sun Aug 29 21:55:12 2010 +0000 Instead of showing score of 0 when people have cheated (shame on you!) display '(cheated)' to make it more clear. git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2...@11558 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit 7da9390c7e51b282f75daed7760c2ed358bdbb1b) src/multimenu.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) ------------------------- Commit: 0edb51ed33f90c4187dc2e5a6dedb5aba01399f7 Trac URL: http://developer.wz2100.net/changeset/0edb51ed33f90c4187dc2e5a6dedb5aba01399f7 Author: Buginator <bugina...@gna.org> Date: Mon Aug 30 01:48:55 2010 +0000 Add "actual" ping times for the Host to the lobby screen. NOTE: These are averaged values, and it takes time for the values to ...average. These numbers were 'hidden' before by the 'traffic light' indicator. This is only a rough estimate of your *actual* ping time. See dev note bravo echo 3. git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2...@11559 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit 378e5405013e766aeb004c7f95bd610c7189c96e) src/multiint.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) ------------------------- Commit: 683a9e65d56168440bc7b604aec513cd7aa1ba19 Trac URL: http://developer.wz2100.net/changeset/683a9e65d56168440bc7b604aec513cd7aa1ba19 Author: buginator <bugina...@gna.org> Date: Mon Oct 18 21:55:42 2010 -0400 Fix a segfault issue with NULL names. git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2...@11564 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit 476aab454a3a0749ddf695cd7b498695dcbd5650) Conflicts: src/loadsave.c src/loadsave.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/loadsave.c b/src/loadsave.c index 8dabca0..faa7570 100644 --- a/src/loadsave.c +++ b/src/loadsave.c @@ -628,7 +628,12 @@ void removeWildcards(char *pStr) { pStr[MAX_SAVE_NAME - 1] = 0; } - + else if (strlen(pStr) == 0) + { + pStr[0] = '!'; + pStr[1] = 0; + return; + } // Trim trailing spaces for (i = strlen(pStr); i > 0 && pStr[i - 1] == ' '; --i) {} ------------------------- Commit: d38bc9d849c616c112f6a05c4cdde29d861c9184 Trac URL: http://developer.wz2100.net/changeset/d38bc9d849c616c112f6a05c4cdde29d861c9184 Author: Buginator <bugina...@gna.org> Date: Thu Sep 2 02:53:13 2010 +0000 Turn off dragging when a in-game popup / menu is shown. Fixes ticket:2086 git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2...@11565 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit 686927f2a4626c56e218c92b83cf15e747f180f8) src/display.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/display.c b/src/display.c index 69ed0e7..91d4df3 100644 --- a/src/display.c +++ b/src/display.c @@ -462,6 +462,11 @@ void processInput(void) BOOL mOverRadar = false; int WheelZoomIterator; + if (InGameOpUp || isInGamePopupUp) + { + dragBox3D.status = DRAG_RELEASED; // disengage the dragging since it stops menu input + } + if(radarOnScreen && getHQExists(selectedPlayer) && CoordInRadar(mouseX(), mouseY())) { mOverRadar = true; ------------------------- Commit: 0be5f2b6e9e1abd05b90bf06485929071191a92e Trac URL: http://developer.wz2100.net/changeset/0be5f2b6e9e1abd05b90bf06485929071191a92e Author: Buginator <bugina...@gna.org> Date: Thu Sep 2 03:03:38 2010 +0000 Add code to look for "novideo.ogg" refs ticket:2052 but don't upload the novideo.ogg yet, since we don't have a clear winner. git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2...@11566 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit 7f6ea5d1a332b7bc535a4a83768b0b90d543df1c) lib/sequence/sequence.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/lib/sequence/sequence.c b/lib/sequence/sequence.c index 31a624f..88ba42e 100644 --- a/lib/sequence/sequence.c +++ b/lib/sequence/sequence.c @@ -503,7 +503,12 @@ bool seq_Play(const char* filename) if (fpInfile == NULL) { info("unable to open '%s' for playback", filename); - return false; + + fpInfile = PHYSFS_openRead("novideo.ogg"); + if (fpInfile == NULL) + { + return false; + } } theora_p = 0; ------------------------- Commit: 6fe94c17e342d2c1d5f6739b1eaaf8f008f8410b Trac URL: http://developer.wz2100.net/changeset/6fe94c17e342d2c1d5f6739b1eaaf8f008f8410b Author: Buginator <bugina...@gna.org> Date: Thu Sep 2 05:40:10 2010 +0000 Trap player to be under MAX_PLAYERS. (looks like player 9 (features) are getting in some routines, and causing crashes.) closes ticket:1972 git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2...@11573 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit 0c2b6ae1e4120f25ccfcb7443f3f60ad16b61c31) src/multiplay.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ------------------------- Commit: 2e2dd97e560c4189fd6b505f6c708792cdcf9fea Trac URL: http://developer.wz2100.net/changeset/2e2dd97e560c4189fd6b505f6c708792cdcf9fea Author: Buginator <bugina...@gna.org> Date: Thu Sep 2 23:56:53 2010 +0000 Change log line to make it obvious it is only enabled in debug builds. git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2...@11574 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit c5090cdc900f3352e00e1c218eb550dff66773b3) src/scriptai.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scriptai.c b/src/scriptai.c index a8ef056..5fc0a12 100644 --- a/src/scriptai.c +++ b/src/scriptai.c @@ -1695,8 +1695,8 @@ BOOL scrSkDoResearch(void) #if defined (DEBUG) { - char sTemp[128]; - sprintf(sTemp,"player:%d starts topic: %s",player, asResearch[i].pName ); + char sTemp[128]; + sprintf(sTemp,"[debug]player:%d starts topic: %s",player, asResearch[i].pName ); NETlogEntry(sTemp, SYNC_FLAG, 0); } #endif ------------------------- Commit: c71700b9fb9ce3fdfab37406cc859e8534670ae8 Trac URL: http://developer.wz2100.net/changeset/c71700b9fb9ce3fdfab37406cc859e8534670ae8 Author: Buginator <bugina...@gna.org> Date: Thu Sep 2 23:59:05 2010 +0000 Add more bounds checks for our favorite player, player 9! closes ticket:2129 git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2...@11575 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit 6e212eb16143457131a52947c37f310d1496e66d) src/multiplay.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) ------------------------- Commit: baab97f7a9b85bedbaad42eedb8c97073d9baec3 Trac URL: http://developer.wz2100.net/changeset/baab97f7a9b85bedbaad42eedb8c97073d9baec3 Author: Buginator <bugina...@gna.org> Date: Fri Sep 3 22:29:33 2010 +0000 Add checks to maps that are too small. fixes ticket:2135 git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2...@11585 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit 43570ae1ff39606503ef8c29b8e31cdf1a48af8f) src/map.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) ------------------------- Commit: 0c4de91732845c4dd95197e1fa3f34d834c8f0c1 Trac URL: http://developer.wz2100.net/changeset/0c4de91732845c4dd95197e1fa3f34d834c8f0c1 Author: buginator <bugina...@gna.org> Date: Mon Oct 18 22:19:50 2010 -0400 Fix a10c7f740eb1e3ce11c11c8ca7c231e55412441f to actually close the filehandle on error. src/map.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/map.c b/src/map.c index 2aa6f82..428f630 100644 --- a/src/map.c +++ b/src/map.c @@ -789,7 +789,7 @@ BOOL mapLoad(char *filename) if (width <=1 || height <=1) { debug(LOG_ERROR, "Map is too small : %u, %u", width, height); - return false; + goto failure; } /* See if this is the first time a map has been loaded */ ------------------------- Commit: 58c0ceec95bd44dfc0c2a54659d3595605eb15dd Trac URL: http://developer.wz2100.net/changeset/58c0ceec95bd44dfc0c2a54659d3595605eb15dd Author: Buginator <bugina...@gna.org> Date: Mon Sep 13 23:53:06 2010 +0000 Fix edit boxes so they correctly calculate the string's pixel borders. Motivation of this patch was because of some whiny guy on IRC. ;) git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2...@11668 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit 81f07188a3693007621496ac9fa0c0e2e8b24b87) lib/widget/editbox.c | 108 +++++++++++++++++++++++++++++++------------------ 1 files changed, 68 insertions(+), 40 deletions(-) ------------------------- Commit: d6b47d1122f751dea01680d3598041e374a21590 Trac URL: http://developer.wz2100.net/changeset/d6b47d1122f751dea01680d3598041e374a21590 Author: Buginator <bugina...@gna.org> Date: Fri Sep 17 02:49:20 2010 +0000 Don't allow a player to acquire more construction vehicles than the max amount allowed. Fixes ticket:2175 git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2...@11674 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit e6cd09968b23f0d7941cc6f15569fbe8c8ef8457) src/droid.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) ------------------------- Commit: f5b845a611239fc12c41fc098a309560bbdd51f1 Trac URL: http://developer.wz2100.net/changeset/f5b845a611239fc12c41fc098a309560bbdd51f1 Author: Buginator <bugina...@gna.org> Date: Sun Sep 19 01:53:23 2010 +0000 Do a bounds check not to exceed NUM_FACTORY_TYPES. git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2...@11684 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit 4b45c471c60d2ae1d9c25e4f96f2c7574f73e1f1) src/hci.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/hci.c b/src/hci.c index 04b22b2..2bd687b 100644 --- a/src/hci.c +++ b/src/hci.c @@ -3531,6 +3531,10 @@ static void orderFactories(void) { inc = 0; type++; + if (type > NUM_FACTORY_TYPES) + { + type = 0; + } } objectInc = 0; } ------------------------- Commit: ec18ac9365bfcc493664ded3af60a71316cd8f08 Trac URL: http://developer.wz2100.net/changeset/ec18ac9365bfcc493664ded3af60a71316cd8f08 Author: buginator <bugina...@gna.org> Date: Mon Oct 18 22:09:50 2010 -0400 Fix SP bug that didn't set the limits correctly for the Cyborg Factory, it really should be fixed in the scripts, however, this will not harm anything, just note that the current limit is MAX_FACTORY which is currently 5. This will *not* fix savegames that already went past the limit! NOTE: Our next release after 2.3.5 will have it fixed in the scripts. refs ticket:2173 git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2...@11697 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit d20fe58222bc883f8be849965217d6245d03cf72) Conflicts: src/structure.c src/structure.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) ------------------------- Commit: 5f83b41456b051892a404f7c053860bc1876f990 Trac URL: http://developer.wz2100.net/changeset/5f83b41456b051892a404f7c053860bc1876f990 Author: buginator <bugina...@gna.org> Date: Mon Oct 18 22:11:16 2010 -0400 Make sure pointer is valid before using it. refs ticket:2171 git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2...@11698 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit 4853171df29c2d8286b5b3a84038189d18bac308) Conflicts: src/structure.c src/structure.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) ------------------------- Commit: ccb286ceaa842f48b077dd24d8b699248202f695 Trac URL: http://developer.wz2100.net/changeset/ccb286ceaa842f48b077dd24d8b699248202f695 Author: buginator <bugina...@gna.org> Date: Mon Oct 18 23:02:34 2010 -0400 Fix ticket:1478 "Non-host players do not get info about the research in progress by allied AIs in MP" git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2...@11556 4a71c877-e1ca-e34f-864e-861f7616d084 (cherry picked from commit edadbb83fd34e65d125d396110db13f8e5cc8097) Conflicts: src/scriptai.c src/scriptfuncs.c src/scriptai.c | 23 +++++++++++++---- src/scriptfuncs.c | 70 ++++++++++++++++++++++------------------------------- 2 files changed, 47 insertions(+), 46 deletions(-) ------------------------- ------------------------------------------------------------------------------ Download new Adobe(R) Flash(R) Builder(TM) 4 The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly Flex(R) Builder(TM)) enable the development of rich applications that run across multiple browsers and platforms. Download your free trials today! http://p.sf.net/sfu/adobe-dev2dev _______________________________________________ Warzone2100-commits mailing list Warzone2100-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
