Commit Graph

882 Commits (39b4a1da37f3370a395d96851d718106aa4a7332)

Author SHA1 Message Date
Dennis Schridde 6d5b7850c4 Backport (from branches/2.0):
- ChangeLog for 2.0.6
- Exception handler


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1293 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-29 09:45:11 +00:00
Gerard Krol baf02b66df Oops, screwed up applying r1290. Broke the build by duplicating the whole function... This fixes it.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1291 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-28 18:38:36 +00:00
Gerard Krol 01ec2ae422 Patch by Watermelon: C89 compliant(MSVC) and removed the 'BOOL same', in the function compare_edge in piedraw.c
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1290 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-28 18:31:35 +00:00
Gerard Krol 2fe34ce6cc Per's patch to use texture compression, modified to always specify generic compression (and let the driver decide which compression to use) and to
only compress the texure pages, and not backdrops and other textures. This this should give a framerate increase of 5-10 fps on fillrate limited 
systems (cpu usage < 100%).


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1289 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-28 15:08:57 +00:00
Giel van Schijndel d659136496 * move audio_id.[ch] to lib/sound (because the soundlib depends on it, and libraries shouldn't depend on the main source, i.e. src/)
* further remove audio_GetIDFromStr from src/aud.c and rename audioID_GetIDFromStr (from audio_id.c) to audio_GetIDFromStr
  * also changed calling method of audio_GetIDFromStr, now it returns its retrieved value (ID index number) rather than writing it in a pointer given as parameter

PS MSVC project might be broken, I don't have it so can't check nor fix it

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1288 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-27 18:59:03 +00:00
Giel van Schijndel 902400c774 Warning fixes:
* NULL assignment to a non-pointer -> changed to assignment of 0
 * remove unused variables
 * remove empty function drawEffects (and a commented out line that called it)
 * Fix implicit declaration (of war_GetFog and war_SetFog) by including warzoneconfig.h

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1287 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-27 17:53:48 +00:00
Gerard Krol ee76f4ce10 Tweaks and optimisations for CPU usage. Tiles are no longer added to the bucket sort, and the size of the bucket array is made smaller. The maximum
number of simultaneous effects is down from 2500 to 500 (a big fight has about 200 effects). The effect processing and drawing is now done from one 
loop instead of from 2 (saves on the iterations). The pie_DrawTexTriangle function defaults to non transparent tiles and sets an alpha drawing mode 
only when needed.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1286 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-27 13:56:36 +00:00
Gerard Krol 8479fe1dad Bugfix: the framerate was always set to 30. Setting it via the config file now actually works.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1282 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-26 13:17:52 +00:00
Gerard Krol a4c540f24a New shadow code, easier on the fillrate of your graphics card, but uses
more cpu time. Buildings have static shadows, the shadows of 
components/droids get recomputed every frame. Rain/bullets/other effects 
do no longer drop a shadow.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1281 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-24 22:53:18 +00:00
Giel van Schijndel 0289e2664f Set executable bit, makes running the script a bit easier.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1278 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-21 00:39:11 +00:00
Gerard Krol c6d06db292 Oops, in r1273 the fog mode was not applied correcly when it was loaded from the config file instead of set by the user. This fixes it the way it
should have been done in the first place.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1276 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-20 21:06:43 +00:00
Gerard Krol 9e3acc087c The distance fog (aka Mist) start and end is now dependent on the zoom level. This should greatly reduce the number of popping tiles that can be
seen.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1275 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-20 20:46:26 +00:00
Christian Vest Hansen 521a12a00d * Initial upload of Python+JSON-RPC based lobby/master server.
I don't claim that this code is of outstanding quality >_>
  It was, after all, just written as a proof of concept prototype...



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1274 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-20 19:23:51 +00:00
Gerard Krol b5ffa39b9a Quick fix to make the game honour the selected fog mode in both singleplayer and multiplayer.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1273 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-20 18:03:05 +00:00
Giel van Schijndel 575e5a1ac7 * Fix bug #8758 (misspelling of "Thermal Amour") changed this to the correct US spelling ("Thermal Armor") for consistency's sake rather than the correct UK spelling ("Thermal Armour")
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1272 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-20 11:33:32 +00:00
Gerard Krol 6d4bbb8577 Fix crash on empty or nonexistent config file.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1266 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-18 21:15:32 +00:00
Giel van Schijndel 354bf5255e set executable bit on debian/rules (special make script for the creation of debian packages)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1264 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-18 15:01:38 +00:00
Dennis Schridde 689c30ae7d Better comments
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1263 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-18 00:41:47 +00:00
Gerard Krol 8a2df06e16 Move weaponROF(WEAPON_STATS *psStat) from design.c to stats.c
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1262 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-18 00:28:18 +00:00
Gerard Krol 95552bad16 The maximum weapon ROF that can be displayed by the design screen is now
(like all properties) determined on loading the stats file. A VTOL 
weapon that reports a ROF of 600 thus now sets the maximum. This might 
be a too large increase, but I don't think that we need to add more bad 
hacks to WZ. This patch was inspired by patch #690.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1261 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-18 00:07:57 +00:00
Per Inge Mathisen 4cbf5789ea More clean up of function and variable declarations in display code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1260 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-17 15:30:34 +00:00
Per Inge Mathisen ec4755b181 Remove dead code from mapdisplay.c and clean up the function declarations in
display3d.c, making many static. Most unused functions marked WZ_DECL_UNUSED
rather than removed for now.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1259 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-16 22:45:30 +00:00
Per Inge Mathisen c0440f8561 Remove unused header
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1258 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-16 22:04:47 +00:00
Per Inge Mathisen 445aa74644 Remove a ton of unused functions that were marked static and started to emit warnings.
A few were given WZ_DECL_UNUSED to silence warnings instead, since they are referenced 
in not yet removed code.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1257 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-16 21:59:43 +00:00
Per Inge Mathisen 2a31399a6a Remove lots of unused stuff from map.h
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1256 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-16 21:39:02 +00:00
Stefan Huehner f953bf0331 Small cleanup:
mark some char* vars and parameters as const.



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1255 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-16 20:26:40 +00:00
Stefan Huehner 59843ec8a2 Code-cleanup:
- make a lot of functions static
- remove unused extern declarations
- fix one function declarations () -> (void)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1254 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-16 20:23:35 +00:00
Stefan Huehner 57674e3545 Minor cleanup.
Remove some unsused vars,function,prototypes



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1253 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-16 20:08:23 +00:00
Dennis Schridde ca3b5909c8 Fix indention and some minor cleanup...
Fixing type-punned pointers is difficult, especially with that HEAP_ALLOC function...


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1252 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-16 19:31:15 +00:00
Per Inge Mathisen cfea4b4b3e Remove strange usage of hash names in soundtrack code. I am not sure
why it worked, or, perhaps, why it still works. Take care ;-)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1251 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-16 19:03:53 +00:00
Per Inge Mathisen 6e21dbe859 Remove unused HASH_NAMES code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1250 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-16 18:47:07 +00:00
Gerard Krol aec9db0a8f Updated the CPU hungry radar only once in 10 frames, instead of twice per frame. Replaced a call to iV_PaletteNearestColour(255, 255, 255) with
PIE_TEXT_WHITE.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1249 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-16 18:26:29 +00:00
Per Inge Mathisen 5b503205ac Fix the strange case of a strresGetString call which is given a hash
string, but does not use hashes. I could not see that it is ever used,
but it must be wrong, so fixing it anyway. Adding the first case of 
gettext markup in the code.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1248 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-16 18:11:47 +00:00
Gerard Krol 81507a85f6 Minor warning fixes.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1247 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-16 18:10:22 +00:00
Per Inge Mathisen e3e1267e7d Fix bug #8730, where we would crash because the game did not find
a texture to replace during game play. The problem is that the 
texture counter is reset several times during a campaign, so we
cannot trust it. This should be fixed more thoroughly later, for 
now we just check all textures irrespective of the texture counter.
Also improves logging, and fixes a problem that should have made
texture replacements simply not work previously. Thanks to
Gernot Kohlhaas <mr_maniac> for reporting the bug.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1246 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-16 17:33:20 +00:00
Dennis Schridde 2a74242eb3 - Replaced various vectors with Vector3i and Vector3f (idea by Watermelon)
- Vector3i from lib/ivis also used in lib/audio, maybe want to move it to some more generic place?
- Replace iPoint with Vector2i
- Remove additional integer type declarations from pietypes.h
- Rename all iSprite to iTexture
- Various warning fixes: Unsigned/signed comparisons, uninitialized variables, declared but not defined symbols
- Replace DEBUG_BLOCK with DEBUG_MALLOC (it was virtually the same)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1245 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-16 16:20:16 +00:00
Dennis Schridde fb2b443b9a Fix r1242
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1244 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-16 13:18:37 +00:00
Gerard Krol 4465a061c1 Fix warnings, and revert r1241 for effects.c (validatePie really needs a prototype at the top)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1242 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-15 23:17:09 +00:00
Dennis Schridde b7ccc234b3 - Remove unused type from pietypes.h
- Replace iBool with BOOL where it was used
- Fix a warning in src/effects.c about validatePie being declared but not defined


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1241 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-15 22:49:54 +00:00
Giel van Schijndel 4532534a82 * update raw Makefiles to comply with r1239 (removal of lib/framework/mono.[ch])
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1240 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-15 22:33:18 +00:00
Gerard Krol 9cc26ea719 Remove the unreferenced mono.[ch] files from lib/framework
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1239 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-15 22:10:52 +00:00
Dennis Schridde e293bf97a3 Fix broken --enable-xxx
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1238 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-15 20:18:28 +00:00
Dennis Schridde 63838c8b2a Documentation for the exceptionhandlers
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1236 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-15 19:12:33 +00:00
Dennis Schridde 9f7b5488e5 Temporary workaround for the NULLDROID issue (bug#8723). Incl. asserts so debug builds can investigate.
Slightly modified wscript. config.h was probably not included in all sourcefiles: I got an assert in release build.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1235 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-15 18:55:31 +00:00
Dennis Schridde 332aae2402 Enhance gdmp with pointer size info.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1233 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-15 12:28:28 +00:00
Dennis Schridde 5f98bde6d6 Readability of code and usage examples for TILE_UNITS/TILE_SHIFT
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1232 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-14 14:41:46 +00:00
Dennis Schridde 7e12df4e35 - Backport r1228 (lib/script/script_parser.y, not initializing ppsLocalVarVal leads to segfault)
- Change some idention and whitespaces


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1229 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-13 20:49:03 +00:00
Gerard Krol 33936df7d9 Removed a strange __APPLE__ ifdef from stencil_one_pass(), and rewrote
the logic in there. 
Hopefully this will fix the crash reported by Richie on the forums.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1227 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-13 19:34:06 +00:00
Dennis Schridde 792cfe8bfa Enhanced POSIX signal handling using sigaction:
- Examine si_code where non default (SI_*) value are possible
- Output signal in style: "SIGNAL: Problem: Reason"
- Handle more signals (all which are marked "A - Abnormal termination of the process" by the POSIX manual)
- Check for XSI extension (_XOPEN_UNIX) instead of presence of every single signal. Hope this works on all systems


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1226 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-13 13:48:59 +00:00
Dennis Schridde ce55d9b457 - Tab-police
- Use Autoconf's internal variables for --with and --enable options
- Use AC_CANONICAL instead of `uname` for Darwin/MacOS detection


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1223 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-10 21:18:09 +00:00