2e6bf47a94
Make psDroid->numKills a float and rename it to psDroid->experience. Commits patch #894
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3122 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-22 17:07:26 +00:00
08d665fe1c
Remove unused palette defines
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3121 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-22 16:55:39 +00:00
3c7898d1c3
Add fancy author/version/doc headers to masterserver
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3120 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-22 15:21:11 +00:00
50c444f6e6
* Apply a large quantity of style changes from patch #888 by EvilGuru (it's a backport from the netcode branch btw) (to reduce the diff-size of it)
...
* Remove some useless casts
* Rewrite some "else { if (X) { } }" statements to "else if (X) { }"
* Rewrite several "if (X) { if (Y) { } }" statements to "if (X && Y) { }"
* Remove some commented out (and sometimes also duplicated) code
* Add some tiny bits of comments here & there
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3119 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-22 00:30:27 +00:00
75753bc3f8
* Replace two uses of strcpy() with the safer strlcpy()
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3118 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-22 00:00:16 +00:00
49958fcc6b
Expire games that were updated > 1 hour ago.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3114 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-21 20:51:06 +00:00
393dc79a05
Fix crash when combat units are assigned to commanders. See bug #10536 .
...
Patch #891 by Thomas Frauendorfer <caotic>.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3113 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-21 18:28:46 +00:00
921520d04b
Remove dead code. Patch #890 by Thomas Frauendorfer <caotic>.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3112 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-21 18:23:18 +00:00
53aa930d6e
Turn IMD min and max dimensions into vectors.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3111 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-21 17:34:23 +00:00
cd415282be
Cleanup renderStructure()
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3110 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-21 17:14:18 +00:00
f85cadbdd2
Fix a bug with cursor trapping that would prevent it working when loading a saved game
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3109 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-20 20:15:34 +00:00
35277a4b82
Temporary fix for bug introduced with commit 3065 that made direct weapons unable to hit. Patch #886 by Buginator.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3108 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-19 20:18:37 +00:00
db3d933791
* Add a new cheat/debug-command "showsamples"
...
* This command will cause the amount of samples in the sound library's queues & lists to be constantly displayed (until turned off) on screen
Patch #887 by Buginator
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3107 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-19 20:17:54 +00:00
ddca71af93
Fixes the broken save game loading from r3100.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3106 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-19 18:36:05 +00:00
29139cc6da
* Fix crashes due to failing to call the callback when sounds are removed from the queue/list
...
Part of patch #887 by Buginator
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3105 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-18 23:25:32 +00:00
41c602ca60
* Don't prefix the FPS rate displayed with leading zeros (there's no need for it)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3104 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-18 23:17:33 +00:00
008266c41f
* Make showFPS a bool instead of an integer (as it can only be enabled or disabled)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3103 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-18 23:07:41 +00:00
a419479ed8
* Remove some usage of macros MAKEINT (just a cast-to-SDWORD macro) and PERCENT (a / b * 100)
...
* ASSERT that our denominator isn't zero to prevent a divide by zero error (which I encountered, thus this patch)
* In the main time provide a work around for when the denominator is zero (which due to the above ASSERT will only be useful for release builds, which is intentionally)
* Move variable percent into a more local scope
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3102 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-18 22:54:10 +00:00
0fa3850cc3
* Remove commented out code (was only active if HARDWARE_TEST was defined, looks like PSX stuff)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3101 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-18 22:48:34 +00:00
718bff04f9
Removal of duplicate code. No changes should be observed.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3100 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-18 21:11:04 +00:00
1e7bf56eba
Fix the horizontal line in the sky that could be seen when using "mist" by increasing the height of the fogbox.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3091 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-17 20:42:13 +00:00
9e5c22f886
Scrolling tweaks: default acceleration is up from 800 to 1000, and scrolling speed increases when zooming out.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3090 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-17 20:32:17 +00:00
d0063a089e
The camera tweaks caused the starting camera position to be "not so nice". This should be fixed now.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3088 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-17 19:40:31 +00:00
5c4384623e
* Use WZ_DECL_FORMAT for some functions which take printf-like strings
...
* This enables GCC to check the formatting strings and the types and number of the variable list of arguments passed
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3087 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-17 19:37:40 +00:00
31fc86ee9f
Moved a space to match formatting
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3085 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-17 17:22:07 +00:00
fa329f1b21
* When drawing the FPS "timer/display" (or whatever you wish to call it) don't make assumptions about the text's size
...
* Instead use iV_GetTextWidth & iV_GetTextHeight to find out...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3084 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-16 21:09:34 +00:00
77644a9dbd
Adjust FPS counter again, since it was in the same position as the chat line.
...
Now it's about centered below the radar. Thanks to Buginator for noticing.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3083 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-16 19:12:18 +00:00
0c975d9c66
Adjust fps counter position, and save/load showFPS to/from the config file.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3082 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-16 18:40:25 +00:00
e9ae19df7b
Fix warning about redefinition of MIN/MAX on OS X (as arpa/inet.h also contains MIN MAX macros)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3081 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-16 18:32:38 +00:00
f703418e6c
Linking fix to allow Warzone to run (installation directory for Popt framework
...
was not set).
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3080 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-16 18:13:49 +00:00
ab26b78691
Warzone trunk now builds under Xcode again. This includes an Autorevision
...
target and changing pos.x, pos.y, and pos.z entries in the endianizing
routines to just x, y, and z to match the updated OBJECT_SAVE_V19 format.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3079 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-16 17:58:34 +00:00
e7f4b3d8b0
Add link (URI) to CC as well, to provide an easy to understand summary of the license.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3078 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-16 16:37:18 +00:00
f5df84b931
* Replace some usages of sprintf combined with iV_DrawText by a single call to iV_DrawTextF
...
* Get rid of a string buffer which isn't needed anymore due to the above change..
* Move string buffer buildInfo into a more local scope (the last place where it is used)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3077 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-16 16:07:46 +00:00
f1f1a19be4
* Fix a bug in iV_DrawTextRotatedFv where I used sprintf instead of vsprintf
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3076 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-16 16:02:54 +00:00
88bf925cb8
* Add functions iV_DrawTextRotatedFv, iV_DrawTextRotatedF, iV_DrawTextFv and iV_DrawTextF to draw text with a printf-like syntax to the screen
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3075 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-16 15:47:55 +00:00
2ff8addf56
Fix fog debug messages that said the opposite of what they meant.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3074 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-16 15:15:01 +00:00
79a8dec64d
Correct my misinterpretation of the license (BY-SA instead of BY-ND) and include a copy of it to fullfil the terms.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3073 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-16 14:21:06 +00:00
d24cf2c233
Update the OS X project
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3072 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-16 12:05:13 +00:00
faa13221b3
Import Pre-GPL changelog, as found in 0.2.2's update.rtf. Dates are entirely missing!! Any veterans knowing them (or at least the year or month) are encouraged to fill the gap.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3071 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-16 10:23:09 +00:00
13fa6cb3d3
Add N.E.W.S.T. tilesets as found in warzone2100-0.2.2 (source-tarball).
...
Licensed from Rman Virgil under CC 3.0 by-nd. (http://creativecommons.org/licenses/by-nd/3.0/ )
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3070 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-16 00:47:44 +00:00
6cc628f38b
Tiny change to Xcode project
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3069 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-15 23:42:29 +00:00
0a9bcf08a3
Xcode project can almost build trunk again. This commit allows the project
...
to download and build the external libraries that Warzone has added since
the last time that trunk would build under Xcode. The actual game currently
will not build due to other issues, but this is phase 1.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3068 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-15 23:34:51 +00:00
4884837ded
Relax camera movement while still preventing clipping through the terrain. Also disable panning to the default angle when releasing the
...
right mouse button.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3067 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-15 23:33:24 +00:00
eba3731a93
* Put some duplicated code for destroying sound samples in function sound_DestroyIteratedSample
...
* If in sound_Update() we encounter an error simply destroy the current sample we're working on
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3066 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-15 20:49:02 +00:00
c4fe7ad919
Update BASE_OBJECT and friends to use Vector3i.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3065 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-15 15:39:29 +00:00
65c56b73e3
Fix an invalid pointer reference in the widget code by making sure that the pointer to the widget currently under the mouse is cleared when the
...
widget is freed.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3064 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-15 14:33:56 +00:00
e0c450b415
Remove excess display related code.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3062 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-15 12:18:56 +00:00
5417afae46
Read tile colour information directly from mapTiles, instead of going through tileScreenInfo
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3057 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-15 11:08:23 +00:00
80d6e7df6d
Use setTileColour accessor for tile lighting.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3055 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-14 16:27:39 +00:00
0484f5e383
We no longer need .wlight to separately store water colour.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3054 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-14 16:21:12 +00:00
Freddie Witherden
Per Inge Mathisen
Dennis Schridde
Giel van Schijndel
Gerard Krol
Ari Johnson
Christian Ohm