6f1fbbde33
Make the droidOrder*() functions take a ModeQueue/ModeImmediate parameter.
...
Removes the need for turnOffMultiMsg() in some places.
Should reduce the number of messages sent over the network a bit.
Also removes two unused functions in src/transporter.[ch].
2010-10-24 19:36:08 +02:00
40ffee51fc
Allow changing game speed in multiplayer when debug mode is enabled.
...
All players should change to the same speed, unless wanting to test what happens if some computers are too slow.
2010-10-24 17:17:54 +02:00
57e5ef77da
Add the Romanian info.plist.
...
Refs #2246
2010-10-24 10:14:25 -04:00
a9ac2c755a
Fix some droids not going to rally points.
...
The droids were getting DORDER_GUARD messages after getting the DORDER_MOVE.
2010-10-23 23:30:36 +02:00
aea0933672
Don't desynch on embarking nor crash on disembarking.
2010-10-23 22:16:28 +02:00
1481ec6830
Fix flamers shooting into outer space due to unsigned underflow and fix penetrating projectiles going 100 times too far.
...
Also, renamed the confusingly named partially-unsigned vectors {startX, startY, srcHeight} and {tarX, tarY, altChange - srcHeight} to signed vectors src and dst, respectively.
2010-10-23 18:02:56 +02:00
5c431a36d1
Convert muzzle location from floats to integers.
2010-10-23 18:02:56 +02:00
9b52ee44b4
Fix synch error, don't let AIs bypass the message queue when starting researching.
2010-10-23 18:02:56 +02:00
e8ebb11d4a
Remove NETnull() function, which was potentially confusing.
...
NETnull() was equivalent to uint32_t zero = 0; NETuint32_t(&zero);, which no longer adds/removes 4 bytes of padding as advertised.
2010-10-23 18:02:56 +02:00
db58c7c5f9
Fix infinite loop when modifying a template in infinite production.
...
If a factory was set to infinite production, but no templates were in the production queue, there was an infinite loop looking for something to produce.
2010-10-23 18:02:56 +02:00
29413f5a01
Nuke most of the unfinished, unused and deprecated tagfile map format code.
2010-10-22 23:19:32 +02:00
1e5c8a77e2
Do not activate a radar detector before it has been completely built. Closes ticket:2202
2010-10-22 19:56:48 +02:00
d8ec229ec6
Use ModeQueue and ModeImmediate instead of maybeDeleteTemplateFromProduction and reallyDeleteTemplateFromProduction.
2010-10-22 18:38:58 +02:00
fcdba754c4
Introduce ModeQueue and ModeImmediate as an alternative to playing with bMultiMessages.
...
Makes campaign queue some messages, and fixes cancelling production queues in campaign.
2010-10-22 18:13:04 +02:00
714b465743
Fix missing declaration from
...
d0217d5d4e
2010-10-21 19:01:36 -04:00
d0217d5d4e
Commit patch from ticket:2110 "Mousewheel menu patch"
...
Author: noccy
Thanks for the patch!
Format and additional changes by me.
Close ticket:2110
(cherry picked from commit e979b6ad620f27e746f119fefd1f613bbb61b8a4)
Conflicts:
src/keybind.c
src/keybind.h
2010-10-21 00:55:55 -04:00
40c5ace37b
Correct typo to make the SuperTransport's enigine output higher (faster)
...
(cherry picked from commit f0b7fc5ed3a9d0de7fd41ee3039b08b50818bec2)
2010-10-20 21:53:03 -04:00
8b50aebec8
fixes Ticket:2233 (artifacts texture issues) fixed by Berg.
...
(don't ask me how the other commit message got mangled)
(cherry picked from commit 9ba8522cb643d10e684725fcf1b158727c7a4756)
2010-10-20 01:25:55 -04:00
3f2540fea3
Fix flashing animation again.
...
Fixed by Berg.
(cherry picked from commit c0a12c32c6f8cd291bd154e2fef669a535732843)
2010-10-20 01:24:05 -04:00
c59292e57e
Fix pie file for transport shadow.
...
Fix by Berg.
(cherry picked from commit b923ae28d7320ae66062bed67c0a3145213b72c8)
2010-10-20 01:23:42 -04:00
18cf896eb7
Check if a structure has a sensor before reading info from it. Fixes crash in threat map code when dealing
...
with lassats. (Of course lassats do things differently than everything else.) Bug found by Cyp.
2010-10-19 20:24:05 +02:00
ccb286ceaa
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.3@11556 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit edadbb83fd34e65d125d396110db13f8e5cc8097)
Conflicts:
src/scriptai.c
src/scriptfuncs.c
2010-10-18 23:02:34 -04:00
5f83b41456
Make sure pointer is valid before using it.
...
refs ticket:2171
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11698 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 4853171df29c2d8286b5b3a84038189d18bac308)
Conflicts:
src/structure.c
2010-10-18 22:24:01 -04:00
ec18ac9365
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.3@11697 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit d20fe58222bc883f8be849965217d6245d03cf72)
Conflicts:
src/structure.c
2010-10-18 22:24:00 -04:00
f5b845a611
Do a bounds check not to exceed NUM_FACTORY_TYPES.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11684 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 4b45c471c60d2ae1d9c25e4f96f2c7574f73e1f1)
2010-10-18 22:24:00 -04:00
d6b47d1122
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.3@11674 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit e6cd09968b23f0d7941cc6f15569fbe8c8ef8457)
2010-10-18 22:23:59 -04:00
58c0ceec95
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.3@11668 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 81f07188a3693007621496ac9fa0c0e2e8b24b87)
2010-10-18 22:23:59 -04:00
0c4de91732
Fix a10c7f740eb1e3ce11c11c8ca7c231e55412441f to actually close the filehandle on error.
2010-10-18 22:23:58 -04:00
baab97f7a9
Add checks to maps that are too small.
...
fixes ticket:2135
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11585 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 43570ae1ff39606503ef8c29b8e31cdf1a48af8f)
2010-10-18 22:23:57 -04:00
c71700b9fb
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.3@11575 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 6e212eb16143457131a52947c37f310d1496e66d)
2010-10-18 22:23:57 -04:00
2e2dd97e56
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.3@11574 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit c5090cdc900f3352e00e1c218eb550dff66773b3)
2010-10-18 22:23:56 -04:00
6fe94c17e3
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.3@11573 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 0c2b6ae1e4120f25ccfcb7443f3f60ad16b61c31)
2010-10-18 22:23:56 -04:00
0be5f2b6e9
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.3@11566 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 7f6ea5d1a332b7bc535a4a83768b0b90d543df1c)
2010-10-18 22:23:55 -04:00
d38bc9d849
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.3@11565 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 686927f2a4626c56e218c92b83cf15e747f180f8)
2010-10-18 22:23:54 -04:00
683a9e65d5
Fix a segfault issue with NULL names.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11564 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 476aab454a3a0749ddf695cd7b498695dcbd5650)
Conflicts:
src/loadsave.c
2010-10-18 22:23:54 -04:00
0edb51ed33
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.3@11559 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 378e5405013e766aeb004c7f95bd610c7189c96e)
2010-10-18 22:23:53 -04:00
2bb1a51bc1
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.3@11558 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 7da9390c7e51b282f75daed7760c2ed358bdbb1b)
2010-10-18 22:23:53 -04:00
f4c3d7ec8e
Change ASCII_NEWLINE from '@' to '`'
...
This enables people to use "@" in chat.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11545 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 10217901eb10fc652c3c8eeb2eba2f519b1f5b0f)
2010-10-18 21:47:48 -04:00
6539a3b19e
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.3@11531 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit e85d0deb556eb00dc17db5bc6d3886fb02bde2fc)
2010-10-18 21:47:17 -04:00
a4cb1d0c46
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.3@11501 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 9ee9ed52dd204ee217741ccfcdf49d2386124e57)
2010-10-18 21:44:52 -04:00
dd87aaf864
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.3@11500 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit bef4eb0f8d5312961ac6b110ece6552fe1098e51)
2010-10-18 21:44:17 -04:00
bc24cd6a22
Try to make the password box more idiot proof.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11492 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 41b6578b911a263cf566ec9db42476215b2ccfe7)
2010-10-18 21:43:14 -04:00
ccd5555275
Remove a (MSVC only) debug() line that spammed way too much.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11321 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit a2a11fccd74485f76dbb098c0bb73de6cc0bd708)
2010-10-18 21:37:48 -04:00
b14ac4422e
Add missing header to fix compilation.
2010-10-19 00:07:37 +02:00
34770f0d63
Add fallback script starting position if map has no HQ by checking for first found truck. This fixes tutorial and danger map bug.
2010-10-18 23:02:01 +02:00
ca7155957d
Do not create danger maps for campaign. Add this later, but there seems to be too many corner cases to handle for now.
2010-10-18 23:01:29 +02:00
6c406f4a68
Always set script starting positions to zero on game init, before loading level data.
...
Set game.maxPlayers to 8 for campaign (more truthful).
2010-10-18 23:00:09 +02:00
ee8024b6ea
Change old obsolete way of checking for single player campaign by checking
...
for game.maxPlayer == 0. Instead, now check game.type == CAMPAIGN.
2010-10-18 22:58:19 +02:00
00406e5154
Remove completely obsolete idea of saving game.type to user settings.
2010-10-18 22:52:55 +02:00
1f857b4a52
Remove unused TILE_HILIGHT bits.
2010-10-18 21:57:39 +02:00
Cyp
dak180
Per Inge Mathisen
buginator
Christian Ohm