Commit Graph

6783 Commits (36acdc554b981c68f7760437be28753aada47f53)

Author SHA1 Message Date
Per Inge Mathisen 3cf38958ea Do not illuminate the tiles belonging to allied players when not in fixed alliance mode.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9198 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:00 +01:00
Guangcong Luo 0d87415593 Fix bug #i-dont-know-what-number-since-the-website-is-down - Radar blips near the edge of the map can disappear at high zoom levels.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9196 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:00 +01:00
Guangcong Luo 541d555e25 Rename Dragon from "Super Heavy Body" to "Multi Turret Body".
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9195 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:00 +01:00
Per Inge Mathisen dbb57342a7 Fix check for hash of correct data, which was setting correctness on a random player instead of the correct player.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9191 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:26:59 +01:00
Per Inge Mathisen a5d3cad363 Fix possibly uninitialized variable
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9190 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:26:59 +01:00
Per Inge Mathisen 817ab66c04 Fix uninitialized variable warning in non-debug builds, and remove all (two) uses of silly define DBCONPRINTF.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9189 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:26:59 +01:00
Per Inge Mathisen 12f9218c67 Fix for compiler warning for uninitialized variable
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9188 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:26:59 +01:00
Per Inge Mathisen 9c6b55f2d6 Remove unused definitions.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9187 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:26:59 +01:00
Guangcong Luo e88e9830b0 Several campaign missions have units come in from off-map. Give them 1 tile unit of leeway before asserting in map_Height.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9180 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:38 +01:00
Guangcong Luo 9856fd1f23 Ctrl+mousewheel is too easy to press accidentally (to change game speed), so change the combination to Ctrl+Alt+mousewheel.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9179 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:38 +01:00
Guangcong Luo 2ab0b17e17 Stop accusing the player of cheating if they try to speed up or slow down the game. Speeding up and slowing down aren't exactly cheats, per se.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9176 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:38 +01:00
Guangcong Luo f13676935c Fix an infinite loop in sound_UpdateStreams.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9175 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:37 +01:00
Christian Ohm dc27d0ed6e Remove removed files from POTFILES.in.
Fixes #1408.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9173 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:37 +01:00
Per Inge Mathisen 640f94ace4 Nudge scav script a bit to make it not crash the script interpreter.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9171 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:37 +01:00
Per Inge Mathisen 7125b11198 Make scavengers work in skirmish again. And they are now meaner than ever.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9170 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:37 +01:00
Christian Ohm 3ba46f736b Adjust loading bar speed for 20 fps.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9169 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:37 +01:00
Per Inge Mathisen c0411ed819 Remove unused wrf files
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9168 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:36 +01:00
Per Inge Mathisen 4eaa4f9afa Fix erroneously commented out line
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9166 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:36 +01:00
Per Inge Mathisen 40652f7257 Fix references to new AI scripts. Remove references to old "campaign" style resource definitions and scripts.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9165 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:36 +01:00
Christian Ohm b5339fcaf7 Decrease loading screen updates to 20 fps.
Was 60 fps, and with vsync enabled, that slowed down loading significantly
(discovered by Cyp). Also remove a useless debug message.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9164 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:36 +01:00
Per Inge Mathisen b8d42bd9fe Change AI script loading. Now AI scripts are kept in ai.slo and ai.vlo, instead of in 8 almost identical files.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9162 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:36 +01:00
Guangcong Luo 187986f92e Fix bug #967 - templates.txt templates (namely, Truck and AI templates) were 1 power point cheaper, and had 1 less HP, than templates created in the Design screen.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9160 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:35 +01:00
Guangcong Luo 6762bad5ca Make build progress bar look nicer - some guy on the forums was complaining about it.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9158 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:35 +01:00
Per Inge Mathisen c9c8b1dbe4 Correct the way droids switch from one unfinished build target to the next. Patch by Cyp.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9156 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:35 +01:00
Per Inge Mathisen 260e292617 Stop complaining about unknown cheat code. It makes it hard to communicate with AIs!
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9155 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:35 +01:00
Guangcong Luo 575c1cc269 Fix bug #1219 - game could assert if commander becomes deselected in a weird way.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9154 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:35 +01:00
Guangcong Luo 7553718c8d Fix bug #1402 - addMultiPlayerRandomArtifacts could send incorrect number of artifacts.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9151 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:35 +01:00
Christian Ohm d8295761fc Add missing include to astartest.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9150 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:34 +01:00
Christian Ohm d278371ac0 wz2100welcome.bmp doesn't exist in trunk.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9149 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:34 +01:00
Per Inge Mathisen 6404ceef2b Fix erroneous name and documentation of function campInit(), which is not campaign specific.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9148 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:34 +01:00
Christian Ohm b0c4e40934 Include files needed for win32 cross-building.
Building from tarball still doesn't work, since nsis wants the gmo files in the
build dir while they are in the source dir.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9146 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:34 +01:00
Christian Ohm d14d6f013d Autosave game after finishing a campaing level.
This saves a game called "Autosave" whenever the "Save Game" option appears
after completing a mission. Enables people to restart a mission even if they
didn't save at the beginning.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9141 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:34 +01:00
Christian Ohm d3af2d3793 Update translations.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9140 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:33 +01:00
Per Inge Mathisen 027cb31486 Make AI use event chainloading for basic structures and new trucks. This means that instead of calling
common AI functions from several places, which can lead to the CPU spending much time doing AI stuff
that frame, or setting the object to idle and wait for a repeat event to pick it up, which can lead to
long delays, it queues up another event for the next AI frame to continue processing.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9133 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:32 +01:00
Per Inge Mathisen 58425f4144 Fix crash in message code when using cheat menu to switch between players. It happened because we would
always search and remove messages for selectedPlayer, even though each player has its own message queue.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9132 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:32 +01:00
Per Inge Mathisen baa0ac2188 Purely stylistic changes to make it easier to read this code for mistakes.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9131 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:32 +01:00
Guangcong Luo 8e6b4e59b6 No need to assert just because the RNG picked a bad place for an oil barrel.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9130 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:32 +01:00
Guangcong Luo 148fdb41e6 Revert accidental addition of initObjectPosition in previous commit.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9128 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:31 +01:00
Guangcong Luo c84e5507bf Fix bug #1393 - incendiary weapon fire can appear in the wrong place - patch provided by Cyp_
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9125 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:31 +01:00
Guangcong Luo ad3c8471fd Don't let CB droids autotarget. (part 2 of workaround for broken SVN)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9123 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:31 +01:00
Guangcong Luo 980bf746e7 Don't let CB droids autotarget. (workaround for broken SVN)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9122 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:31 +01:00
Guangcong Luo c7a7cc67bd Fix typo in multijoin.c.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9120 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:31 +01:00
Per Inge Mathisen d6cc3625b7 Fix buildDroid() assert message and make it more informative to help track down a bug in it.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9117 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:31 +01:00
Per Inge Mathisen 6503ef53b6 Mitigate a crash in blueprint drawing. Also add more debug info when bug happens. Closes ticket:1334
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9115 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:30 +01:00
Per Inge Mathisen 38f13ca05f Fix spelling error in debug message
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9114 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:30 +01:00
Per Inge Mathisen 35c3ef9d35 When picking a tile based on a given start coordinate, make sure the result coordinate is on
the same continent as the start coordinate. This hopefully fixes ticket:1385


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9112 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:30 +01:00
Guangcong Luo b1f7e8ba17 Add more debugging information to recvDataCheck().
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9111 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:30 +01:00
Per Inge Mathisen 9548a4da75 2.3: In the buildDroid script command, change ASSERTs to ASSERT_OR_RETURNs so that
we can recover from errors. This is an attempt to mitigate the problem in ticket:1383


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9109 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:30 +01:00
Per Inge Mathisen 4f963349cc Fix the order audio samples are removed so that they actually are removed properly.
Patch by jovie1024. This closes ticket:1391


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9106 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:29 +01:00
Per Inge Mathisen 467730a50e Fix sensor auto-targetting. Patch by Cyp. Closes ticket:1392
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9104 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:29 +01:00