Permalink
Browse files

Merge remote branch 'origin/master' into qt

Conflicts:
	lib/exceptionhandler/exceptionhandler.vcproj
	lib/framework/frame.h
	lib/framework/framework.vcproj
	lib/gamelib/gamelib.vcproj
	lib/iniparser/iniparser.vcproj
	lib/ivis_opengl/ivis_opengl.vcproj
	lib/netplay/netplay.vcproj
	lib/script/script.vcproj
	lib/sequence/sequence.vcproj
	lib/sound/sound.vcproj
	lib/widget/widget.vcproj
	src/Makefile.am
	win32/Warzone2100.vcproj
  • Loading branch information...
2 parents 57cafbc + 23fb1b0 commit 64cfc58c47b04026fbc969a24ab9649056f3f3b4 @Cyp Cyp committed Mar 19, 2011
Showing with 5,249 additions and 5,004 deletions.
  1. +11 −1 .gitignore
  2. +14 −0 build_tools/autorevision.bat
  3. +4 −0 build_tools/autorevision.sh
  4. +14 −19 data/base/images/frontend.img
  5. BIN data/base/images/frontend4.png
  6. +4 −0 data/base/images/intfac.img
  7. BIN data/base/images/intfac2.png
  8. +30 −30 data/base/multiplay/skirmish/dydo.slo
  9. +5 −0 data/mods/multiplay/old-1.10-balance/messages/strings/names.txt
  10. +0 −189 lib/exceptionhandler/exceptionhandler.vcproj
  11. +157 −0 lib/exceptionhandler/exceptionhandler.vcxproj
  12. +39 −0 lib/exceptionhandler/exceptionhandler.vcxproj.filters
  13. +1 −1 lib/framework/SDL_framerate.h
  14. +0 −443 lib/framework/framework.vcproj
  15. +244 −0 lib/framework/framework.vcxproj
  16. +201 −0 lib/framework/framework.vcxproj.filters
  17. +4 −2 lib/framework/math_ext.h
  18. +1 −1 lib/framework/resource_lexer.l
  19. +1 −1 lib/framework/strres_lexer.l
  20. +18 −0 lib/framework/types.h
  21. +14 −0 lib/framework/wzglobal.h
  22. +1 −1 lib/gamelib/audp_lexer.l
  23. +0 −241 lib/gamelib/gamelib.vcproj
  24. +184 −0 lib/gamelib/gamelib.vcxproj
  25. +66 −0 lib/gamelib/gamelib.vcxproj.filters
  26. +0 −172 lib/iniparser/iniparser.vcproj
  27. +141 −0 lib/iniparser/iniparser.vcxproj
  28. +23 −0 lib/iniparser/iniparser.vcxproj.filters
  29. +27 −0 lib/ivis_opengl/glee/ReadMe.txt
  30. +112 −0 lib/ivis_opengl/glee/glee.vcxproj
  31. +30 −0 lib/ivis_opengl/glee/glee.vcxproj.filters
  32. +0 −250 lib/ivis_opengl/ivis_opengl.vcproj
  33. +176 −0 lib/ivis_opengl/ivis_opengl.vcxproj
  34. +128 −0 lib/ivis_opengl/ivis_opengl.vcxproj.filters
  35. +49 −14 lib/ivis_opengl/pieblitfunc.cpp
  36. +1 −0 lib/ivis_opengl/pieblitfunc.h
  37. +1 −0 lib/ivis_opengl/piedef.h
  38. +4 −1 lib/ivis_opengl/piedraw.cpp
  39. +0 −320 lib/netplay/netplay.vcproj
  40. +198 −0 lib/netplay/netplay.vcxproj
  41. +119 −0 lib/netplay/netplay.vcxproj.filters
  42. +1 −0 lib/script/chat_lexer.l
  43. +0 −281 lib/script/script.vcproj
  44. +194 −0 lib/script/script.vcxproj
  45. +96 −0 lib/script/script.vcxproj.filters
  46. +2 −1 lib/script/script_lexer.l
  47. +0 −186 lib/sequence/sequence.vcproj
  48. +147 −0 lib/sequence/sequence.vcxproj
  49. +29 −0 lib/sequence/sequence.vcxproj.filters
  50. +1 −1 lib/sound/audio.cpp
  51. +0 −235 lib/sound/sound.vcproj
  52. +161 −0 lib/sound/sound.vcxproj
  53. +71 −0 lib/sound/sound.vcxproj.filters
  54. +0 −238 lib/widget/widget.vcproj
  55. +159 −0 lib/widget/widget.vcxproj
  56. +77 −0 lib/widget/widget.vcxproj.filters
  57. +27 −29 po/cs.po
  58. +27 −29 po/da.po
  59. +25 −27 po/de.po
  60. +27 −29 po/en_GB.po
  61. +24 −27 po/es.po
  62. +27 −29 po/et_EE.po
  63. +15 −27 po/fi.po
  64. +27 −29 po/fr.po
  65. +26 −28 po/fy.po
  66. +15 −27 po/ga.po
  67. +27 −29 po/hr.po
  68. +24 −27 po/it.po
  69. +26 −28 po/ko.po
  70. +15 −27 po/la.po
  71. +26 −28 po/lt.po
  72. +15 −27 po/nb.po
  73. +27 −29 po/nl.po
  74. +26 −28 po/pl.po
  75. +27 −29 po/pt.po
  76. +24 −27 po/pt_BR.po
  77. +26 −28 po/ro.po
  78. +26 −28 po/ru.po
  79. +26 −28 po/sk.po
  80. +27 −29 po/sl.po
  81. +24 −27 po/tr.po
  82. +27 −29 po/uk_UA.po
  83. +27 −29 po/zh_CN.po
  84. +27 −29 po/zh_TW.po
  85. +1 −1 src/Makefile.am
  86. +580 −0 src/Warzone2100.vcxproj
  87. +753 −0 src/Warzone2100.vcxproj.filters
  88. +14 −35 src/component.cpp
  89. +4 −0 src/configuration.cpp
  90. +0 −17 src/display.cpp
  91. +1 −1 src/droid.cpp
  92. +1 −1 src/droiddef.h
  93. +1 −1 src/fpath.cpp
  94. +8 −12 src/frend.h
  95. +8 −8 src/frontend.cpp
  96. +34 −13 src/hci.cpp
  97. +1 −1 src/hci.h
  98. +31 −1 src/intdisplay.cpp
  99. +1 −0 src/intdisplay.h
  100. +16 −11 src/intfac.h
  101. +1 −1 src/level_lexer.l
  102. +1 −1 src/message_lexer.l
  103. +8 −10 src/move.cpp
  104. +29 −24 src/multiint.cpp
  105. +1 −1 src/multiint.h
  106. +24 −28 src/multimenu.cpp
  107. +2 −2 src/scriptvals_lexer.l
  108. +32 −74 src/structure.cpp
  109. +1 −1 src/structuredef.h
  110. +1 −0 win32/Makefile.am
  111. +48 −31 win32/Warzone2100.sln
  112. +0 −1,267 win32/Warzone2100.vcproj
  113. +0 −47 win32/warzone2100.vs2k5.rc
View
@@ -76,8 +76,10 @@ win32/__BUILD_CONFIG.USER
# Autogenerated files:
*.lex.[ch]
*.tab.[ch]
+*.lex.[ch]pp
+*.tab.[ch]pp
/src/autorevision.h
-/tests/maplist.txt
+
# Generated executables:
/build_tools/autorevision/autorevision
@@ -217,6 +219,14 @@ data/config/*
data/etc/*
data/fonts/
devpkg/*
+*.opensdf
+*.sdf
+*.ipch
+*.tlog
+*.lastbuildstate
+*.cache*
+*manifest.*
+*.exp
# profiler stuff
win32/CodeAnalyst
@@ -0,0 +1,14 @@
+echo "Building autorevision.h... (msysgit must be in system path)"
+IF EXIST %1..\src\autorevision.h del %1..\src\autorevision.h
+sh.exe %1..\build_tools\autorevision.sh %1..\src\autorevision.h.lf
+IF NOT EXIST %1..\src\autorevision.h.lf goto failed:
+echo "converting file to CRLF from LF"
+perl -p -e 's/\n/\r\n/' < %1..\src\autorevision.h.lf > %1..\src\autorevision.h
+del %1..\src\autorevision.h.lf
+IF EXIST %1..\src\autorevision.h goto good:
+:failed
+echo "Failed! Is msysgit in your system path?"
+exit
+:good
+echo "File has been generated."
+exit
@@ -17,6 +17,10 @@ function gitRepo {
# Enumeration of changesets
VCS_NUM="$(git rev-list --count HEAD)"
+ if [ -z "${VCS_NUM}" ]; then
+ echo "warning: Counting the number of revisions may be slower due to an outdated git version less than 1.7.2.3. If something breaks, please update it."
+ VCS_NUM="$(git rev-list HEAD | wc -l)"
+ fi
# The full revision hash
VCS_FULL_HASH="$(git rev-parse HEAD)"
@@ -29,11 +29,8 @@
4,234,63,22,19,0,0,"IMAGE PLAYER8"
4,71,155,22,19,0,0,"IMAGE PLAYER9"
4,93,155,22,19,0,0,"IMAGE PLAYER10"
-4,115,155,22,19,0,0,"IMAGE PLAYER11"
-4,215,168,22,19,0,0,"IMAGE PLAYER12"
-4,71,174,22,19,0,0,"IMAGE PLAYER13"
-4,93,174,22,19,0,0,"IMAGE PLAYER14"
-4,115,174,22,19,0,0,"IMAGE PLAYER15"
+4,115,155,22,19,0,0,"IMAGE PLAYERN"
+4,215,168,22,19,0,0,"IMAGE PLAYERN TC"
2,219,135,35,28,0,0,"IMAGE HOST"
2,112,25,35,24,0,0,"IMAGE NO"
2,148,25,35,24,0,0,"IMAGE OK"
@@ -112,6 +109,7 @@
2,203,62,9,10,0,0,"IMAGE MULTIRANK2"
2,216,61,8,13,0,0,"IMAGE MEDAL DUMMY"
2,80,25,24,21,-1,-1,"IMAGE PLAYERX"
+4,181,180,24,21,-1,-1,"IMAGE PLAYERX TC"
3,0,75,35,24,0,0,"IMAGE FOG OFF"
3,36,75,35,24,0,0,"IMAGE FOG ON"
3,72,75,35,24,0,0,"IMAGE FOG OFF HI"
@@ -143,8 +141,8 @@
2,168,182,35,28,0,0,"IMAGE HOST HI"
3,221,54,78,29,0,0,"IMAGE KEYMAP DEFAULT HI"
4,6,56,19,24,3,0,"IMAGE EDIT MAP HI"
-4,29,55,27,22,0,0,"IMAGE EDIT PLAYER HI"
-4,62,55,20,24,3,0,"IMAGE EDIT GAME HI"
+4,29,55,27,22,0,0,"IMAGE EDIT GAME HI"
+4,62,55,20,24,3,0,"IMAGE EDIT PLAYER HI"
4,1,82,22,19,0,0,"IMAGE PLAYER0 HI"
4,24,82,22,19,0,0,"IMAGE PLAYER1 HI"
4,47,82,22,19,0,0,"IMAGE PLAYER2 HI"
@@ -156,11 +154,8 @@
4,49,180,22,19,0,0,"IMAGE PLAYER8 HI"
4,137,180,22,19,0,0,"IMAGE PLAYER9 HI"
4,159,180,22,19,0,0,"IMAGE PLAYER10 HI"
-4,181,180,22,19,0,0,"IMAGE PLAYER11 HI"
-4,203,187,22,19,0,0,"IMAGE PLAYER12 HI"
-4,225,187,22,19,0,0,"IMAGE PLAYER13 HI"
-4,143,199,22,19,0,0,"IMAGE PLAYER14 HI"
-4,165,199,22,19,0,0,"IMAGE PLAYER15 HI"
+4,71,174,22,19,0,0,"IMAGE PLAYERN HI"
+4,93,174,22,19,0,0,"IMAGE PLAYERN HI TC"
4,0,103,25,21,0,0,"IMAGE TEAM0 HI"
4,25,103,25,21,0,0,"IMAGE TEAM1 HI"
4,50,103,25,21,0,0,"IMAGE TEAM2 HI"
@@ -185,14 +180,14 @@
4,36,131,35,24,0,0,"IMAGE DARK UNLOCKED"
4,72,131,35,24,-4,0,"IMAGE LOCKED NOBG"
4,108,131,35,24,-4,0,"IMAGE UNLOCKED NOBG"
-4,144,131,35,24,0,0,"IMAGE LOCKED TRANS"
-4,180,131,35,24,0,0,"IMAGE UNLOCKED TRANS"
+4,144,131,35,24,0,0,"IMAGE TRANS LOCKED"
+4,180,131,35,24,0,0,"IMAGE TRANS UNLOCKED"
4,0,181,20,24,0,0,"IMAGE_UNLOCK_BLUE"
-4,29,181,20,24,0,0,"IMAGE_LOCK_BLUE"
-4,0,156,35,24,0,0,"IMAGE DARK SCAV"
-4,36,156,35,24,0,0,"IMAGE DARK NOSCAV"
-4,144,156,35,24,0,0,"IMAGE HI SCAV"
-4,180,156,35,24,0,0,"IMAGE HI NOSCAV"
+4,29,181,20,24,0,0,"IMAGE LOCK BLUE"
+4,0,156,35,24,0,0,"IMAGE SCAVENGERS ON"
+4,36,156,35,24,0,0,"IMAGE SCAVENGERS OFF"
+4,144,156,35,24,0,0,"IMAGE SCAVENGERS ON HI"
+4,180,156,35,24,0,0,"IMAGE SCAVENGERS OFF HI"
4,0,206,35,24,0,0,"IMAGE_KICK"
4,36,206,35,24,0,0,"IMAGE_VTOL"
4,72,206,35,24,0,0,"IMAGE_CYBORG"
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -535,3 +535,7 @@
1,101,133,5,9,-2,-6,"IMAGE RAD BURNRES4"
1,108,132,5,10,-2,-7,"IMAGE RAD BURNRES5"
1,114,131,6,11,-3,-8,"IMAGE RAD BURNRES6"
+2,208,14,14,12,0,0,"IMAGE ALLY RESEARCH"
+2,208,26,14,12,0,0,"IMAGE ALLY RESEARCH TC"
+2,207,0,25,14,0,0,"IMAGE GENERIC TANK"
+2,183,14,25,14,0,0,"IMAGE GENERIC TANK TC"
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -1527,7 +1527,7 @@ event AIbrain (inactive)
}
}
- ASSERT(player >= 0 and player < 8, "player out of bounds: AIbrain " & player, player);
+ ASSERT(player >= 0 and player < MAX_PLAYERS, "player out of bounds: AIbrain " & player, player);
//reset alert
if (gameTime - alertTime > TIME_TO_RESET_ALERT){
@@ -1952,7 +1952,7 @@ event AIbrain (inactive)
========================================================================*/
event vtolEnabler(inactive)
{
- ASSERT(player >= 0 and player < 8, "player out of bounds: vtolEnabler " & player, player);
+ ASSERT(player >= 0 and player < MAX_PLAYERS, "player out of bounds: vtolEnabler " & player, player);
dbg("vtolEnabler: __________ ("& skVtolEnableCheck(0) &") 1("& skVtolEnableCheck(1) &") 7("& skVtolEnableCheck(7) &")__________",player);
if( skVtolEnableCheck(player) ) // check to see if we have vtol technologies.
@@ -2230,7 +2230,7 @@ event vtolStructs(inactive)
local int _totalVTOLS;
local int _numVtolFacs,_numRearmPads;
- ASSERT(player >= 0 and player < 8, "player out of bounds: vtolStructs " & player, player);
+ ASSERT(player >= 0 and player < MAX_PLAYERS, "player out of bounds: vtolStructs " & player, player);
//displayMsg("vtolStructs: vtolStructs event called");
if( !isStructureAvailable(vtolFactory,player) ){
@@ -2283,7 +2283,7 @@ event buildVtols(inactive)
local int _totalVTOLS;
- ASSERT(player >= 0 and player < 8, "player out of bounds: buildVtols " & player, player);
+ ASSERT(player >= 0 and player < MAX_PLAYERS, "player out of bounds: buildVtols " & player, player);
//displayMsg("buildVtols: buildVtols event called - 1 nProdSelect("& nProdSelect &") lStopVTOLProduction("& lStopVTOLProduction &") lMinBaseStructBuilt("& lMinBaseStructBuilt &")");
@@ -2324,7 +2324,7 @@ event manageDefVTOL(inactive)
local int _dist,_nVTOLSRequired;
local string _dbgString;
- ASSERT(player >= 0 and player < 8, "player out of bounds: manageDefVTOL " & player, player);
+ ASSERT(player >= 0 and player < MAX_PLAYERS, "player out of bounds: manageDefVTOL " & player, player);
if ( attTargetVTOL != NULLOBJECT ){
_dist = distBetweenTwoPoints( attTargetVTOL.x, attTargetVTOL.y, baseX, baseY);
@@ -2577,7 +2577,7 @@ event buildBase(inactive) //event 8
{
local int _f,_r,_c,_v,_h,_l;
- ASSERT(player >= 0 and player < 8, "player out of bounds: buildBase " & player, player);
+ ASSERT(player >= 0 and player < MAX_PLAYERS, "player out of bounds: buildBase " & player, player);
eventCheckTime[2] = gameTime;
if ( lStopBuildingStructures ){
@@ -3189,7 +3189,7 @@ event TankAttack(inactive)
local int _distFromObj;
- ASSERT(player >= 0 and player < 8, "player out of bounds: TankAttack " & player, player);
+ ASSERT(player >= 0 and player < MAX_PLAYERS, "player out of bounds: TankAttack " & player, player);
//if ( gameTime - lastDisplayAI >= 10 ){
//dbg("dbg->TankAttack : tank ("& tankGroup.members &") bTankAlreadyGathered("& bTankAlreadyGathered &") targ("& targetPlayerTank &") x-Y("& tankAttackX &")("& tankAttackY &") ",player);
//}
@@ -3342,7 +3342,7 @@ event CyborgAttack(inactive)//Original event ID: xx (of 106)
{
local int _distFromObj;
- ASSERT(player >= 0 and player < 8, "player out of bounds: CyborgAttack " & player, player);
+ ASSERT(player >= 0 and player < MAX_PLAYERS, "player out of bounds: CyborgAttack " & player, player);
//dbg("dbg->CyborgAttack: '"& getPlayerName(player) &"' cyborgs ("& cyborgAttGroup.members &") CALLED bCybAlreadyGathered("& bCybAlreadyGathered &") targ("& targetPlayerCyb &") x-Y("& cybAttackX &")("& cybAttackY &")",player);
//do a preliminary check
@@ -3527,7 +3527,7 @@ event AIattacked(AIattackedTr) //event 20
else
{
*/
- ASSERT(player >= 0 and player < 8, "player out of bounds: myDroidAttacked " & player, player);
+ ASSERT(player >= 0 and player < MAX_PLAYERS, "player out of bounds: myDroidAttacked " & player, player);
bProceed = true;
@@ -3679,7 +3679,7 @@ event manageDefTank( inactive )
local int _x,_y,_x1,_y1, _nDist;
- ASSERT(player >= 0 and player < 8, "player out of bounds: manageDefTank " & player, player);
+ ASSERT(player >= 0 and player < MAX_PLAYERS, "player out of bounds: manageDefTank " & player, player);
eventCheckTime[6] = gameTime;
//if ( gameTime - lastDisplayAI >= 80 ){
@@ -3782,7 +3782,7 @@ event manageDefCyborgs (inactive)//event 18!!!!
local int _x,_y,_x1,_y1,_nDist;
- ASSERT(player >= 0 and player < 8, "player out of bounds: manageDefCyborgs " & player, player);
+ ASSERT(player >= 0 and player < MAX_PLAYERS, "player out of bounds: manageDefCyborgs " & player, player);
eventCheckTime[5] = gameTime;
//if ( gameTime - lastDisplayAI >= 90 ){
//displayMsg("manageDefCyborgs: cyborgs ("& cyborgDefGroup.members &") CALLED ("& alertIsOn &") ("& alertX &"-"& alertY &") ");
@@ -3884,7 +3884,7 @@ event manageDefCyborgs (inactive)//event 18!!!!
event manageIdleTrucks(inactive)
{
- ASSERT(player >= 0 and player < 8, "player out of bounds: manageIdleTrucks " & player, player);
+ ASSERT(player >= 0 and player < MAX_PLAYERS, "player out of bounds: manageIdleTrucks " & player, player);
eventCheckTime[7] = gameTime;
//dbg("manageIdleTrucks: ________________ START 1__________________",player);
if ( gameTime < 300 ) { exit; }
@@ -3990,7 +3990,7 @@ event manageIdleTrucks(inactive)
event manageRepairTeam(inactive)
{
- ASSERT(player >= 0 and player < 8, "player out of bounds: manageRepairTeam " & player, player);
+ ASSERT(player >= 0 and player < MAX_PLAYERS, "player out of bounds: manageRepairTeam " & player, player);
//if ( gameTime - lastDisplayAI >= 80 ){
//displayMsg("manageRepairTeam: _____________ START 1("& toBeRepairedCyborgGroup.members &")("& toBeRepairedTankGroup.members &")("& repairGroup.members &") _______________");
@@ -4244,7 +4244,7 @@ event updateBaseDetails(inactive)
// ============================ Debug messages====================
event showPlayerInfo (inactive)
{
- ASSERT(player >= 0 and player < 8, "player out of bounds: showPlayerInfo " & player, player);
+ ASSERT(player >= 0 and player < MAX_PLAYERS, "player out of bounds: showPlayerInfo " & player, player);
boolResult = true;
}
@@ -4253,7 +4253,7 @@ event buildRepFirst(inactive)
{
local int _nMaxRepFac;
- ASSERT(player >= 0 and player < 8, "player out of bounds:.5 " & player, player);
+ ASSERT(player >= 0 and player < MAX_PLAYERS, "player out of bounds:.5 " & player, player);
eventCheckTime[9] = gameTime;
//displayMsg("lStopBuildRepFacility ("& lStopBuildRepFacility &") nPower("& nPower &")");
@@ -4302,7 +4302,7 @@ event buildRepFirst(inactive)
//====================================ADVANCED HARVESTER SCRIPT==========================
event harvesterOperate(inactive)
{
- ASSERT(player >= 0 and player < 8, "player out of bounds: harvesterOperate " & player, player);
+ ASSERT(player >= 0 and player < MAX_PLAYERS, "player out of bounds: harvesterOperate " & player, player);
eventCheckTime[10] = gameTime;
//displayMsg("harvestOperate: called ("& bOilResLeft &") ("& harvesterGroup.members &")");
@@ -4367,7 +4367,7 @@ event harvesterOperate(inactive)
event truckGroupSlider(inactive)
{
- ASSERT(player >= 0 and player < 8, "player out of bounds: truckGroupSlider " & player, player);
+ ASSERT(player >= 0 and player < MAX_PLAYERS, "player out of bounds: truckGroupSlider " & player, player);
eventCheckTime[11] = gameTime;
//displayMsg("truckGroupSlider 1: b("& buildGroup.members &") d("& buildDefGroup.members &") h("& harvesterGroup.members &") ");
//at this time the harvesting phase should be finished
@@ -4499,7 +4499,7 @@ event defendDerrick(inactive)
{
local STRUCTURESTAT _defStruct;
- ASSERT(player >= 0 and player < 8, "player out of bounds: defendDerrick " & player, player);
+ ASSERT(player >= 0 and player < MAX_PLAYERS, "player out of bounds: defendDerrick " & player, player);
eventCheckTime[12] = gameTime;
if (lStopBuildDefDerricks){exit;}
@@ -4540,7 +4540,7 @@ event defendDerrick(inactive)
event buildPowerGenerators(inactive)
{
- ASSERT(player >= 0 and player < 8, "player out of bounds:.13 " & player, player);
+ ASSERT(player >= 0 and player < MAX_PLAYERS, "player out of bounds:.13 " & player, player);
eventCheckTime[13] = gameTime;
//search for incompleted structure fist
@@ -4584,7 +4584,7 @@ event buildPowerGenerators(inactive)
//-------------------------------------
event defendGatewaysPoint(inactive)
{
- ASSERT(player >= 0 and player < 8, "player out of bounds: defendGatewaysPoint " & player, player);
+ ASSERT(player >= 0 and player < MAX_PLAYERS, "player out of bounds: defendGatewaysPoint " & player, player);
eventCheckTime[14] = gameTime;
_idleTruck = NULLOBJECT;
_notIdleTruck = NULLOBJECT;
@@ -4628,7 +4628,7 @@ event defendBase(inactive)
{
local STRUCTURESTAT _defStruct;
- ASSERT(player >= 0 and player < 8, "player out of bounds: defendBase " & player, player);
+ ASSERT(player >= 0 and player < MAX_PLAYERS, "player out of bounds: defendBase " & player, player);
eventCheckTime[15] = gameTime;
//dbg("dbg->defendBase: lStopBuildDef ("& lStopBuildDef &") time("& gameTime - tLastbuildBaseDef &") > ("& TIME_TOFORCE_BUILDDEF &")",player);
@@ -4698,7 +4698,7 @@ event defendBase(inactive)
// ==========================================================================
event upgradeStructures(inactive)
{
- ASSERT(player >= 0 and player < 8, "player out of bounds:.17 " & player, player);
+ ASSERT(player >= 0 and player < MAX_PLAYERS, "player out of bounds:.17 " & player, player);
eventCheckTime[16] = gameTime;
@@ -4806,7 +4806,7 @@ event droidBuilt(droidBuiltTr) // (CALL_NEWDROID,player, ref droid,ref structur
{
*/
- ASSERT(player >= 0 and player < 8, "player out of bounds: droidBuilt " & player, player);
+ ASSERT(player >= 0 and player < MAX_PLAYERS, "player out of bounds: droidBuilt " & player, player);
boolResult = true;
//dbg("dbg->droidBuilt : droid ("& droid.id &") hitPoints ("& droid.hitPoints &") ",player);
@@ -4951,7 +4951,7 @@ event reSortUnits(inactive)
*/
- ASSERT(player >= 0 and player < 8, "player out of bounds: reSortUnits " & player, player);
+ ASSERT(player >= 0 and player < MAX_PLAYERS, "player out of bounds: reSortUnits " & player, player);
groupAddAreaNoGroup(xGroup, player, 0, 0, (mapWidth*128), (mapHeight*128));
//dbg("reSortUnits: xGroup.members bofore re-sort ("& xGroup.members &") _________________",player);
@@ -4980,7 +4980,7 @@ event SelectTankTemplate(inactive)
local int _nRnd, _nRnd2,_nBestHvyBody,_nBestMedBody,_nBestLghBody;
eventCheckTime[17] = gameTime;
- ASSERT(player >= 0 and player < 8, "player out of bounds:.27 " & player, player);
+ ASSERT(player >= 0 and player < MAX_PLAYERS, "player out of bounds:.27 " & player, player);
//displayMsg("SelectTankTemplate 1: nWorkingFact("& nWorkingFact &") nFactories("& nFactories &") boolResult ("& boolResult &") nProdSelect("& nProdSelect &") stopProdTank("& lStopTankProduction &")_______________");
@@ -5147,7 +5147,7 @@ event SelectCyborgTemplate(inactive)
local int _nRnd, _pos;
local bool _bBuildAR_cyborg, _bBuildAT_cyborg, _bBuildAP_cyborg, _bBuildKK_cyborg;
- ASSERT(player >= 0 and player < 8, "player out of bounds:.29 " & player, player);
+ ASSERT(player >= 0 and player < MAX_PLAYERS, "player out of bounds:.29 " & player, player);
eventCheckTime[18] = gameTime;
//displayMsg("*** SelectCyborgTemplate: ___________ CALLED lStopCybProduction("& lStopCybProduction &") droids tot("& getDroidCount(player) &"/"& MAX_DROIDS &")___________");
@@ -5291,7 +5291,7 @@ event buildRepFacSuppAttack(inactive)
// do research
event doResearch(inactive)//doResearchTr
{
- ASSERT(player >= 0 and player < 8, "player out of bounds:.44 " & player, player);
+ ASSERT(player >= 0 and player < MAX_PLAYERS, "player out of bounds:.44 " & player, player);
eventCheckTime[20] = gameTime;
//displayMsg("doResearch:___________("& lStopResearch &")prod["& nProdSelect &"]work("& getNumStructNotIdle(resLab) &")______________");
@@ -5474,7 +5474,7 @@ event manageHelpTeam(inactive)
local int _dist;
- ASSERT(player >= 0 and player < 8, "player out of bounds: manageHelpTeam " & player, player);
+ ASSERT(player >= 0 and player < MAX_PLAYERS, "player out of bounds: manageHelpTeam " & player, player);
if ( gameTime - tProd4 >= 80 ){
@@ -6928,7 +6928,7 @@ function void debugCentreView(DROID _droid)
local int _player;
_player = 0;
if( debugCenterView == true ){
- while(_player < 8)
+ while(_player < MAX_PLAYERS)
{
if( isHumanPlayer(_player) and allianceExistsBetween(_player,player) ) { //OK
centreView(_droid);
@@ -10780,7 +10780,7 @@ function void displayStats(int _choice)
local int _cG, _totHarv, _enWeap, _myWeap, _myWeapSTR, _enemyCost, _friendCost;
local int _count,_count2;
- ASSERT(player >= 0 and player < 8, "player out of bounds: showPlayerInfo " & player, player);
+ ASSERT(player >= 0 and player < MAX_PLAYERS, "player out of bounds: showPlayerInfo " & player, player);
_count=0;
while ( _count < 11 )
Oops, something went wrong.

0 comments on commit 64cfc58

Please sign in to comment.