Commit Graph

956 Commits (0bba8687ee1475ed64e506fc6110afa5d09db86b)

Author SHA1 Message Date
Giel van Schijndel b8cac46766 * Update POTFILES.in to the deletion of pqueue in r1378 (btw, do we really need all files listed twice there?)
* Add Dutch translation

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1382 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-06 00:15:00 +00:00
Dennis Schridde c01ef9e12a Add the missing file without autoconf won't succeed. Problem reported by Giel.
If you find a different fix other than adding this file here: Feel free to revert.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1381 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-05 23:27:10 +00:00
Giel van Schijndel a3ac39aa7d * fix a compile error caused by a curly brace to many
* (probably caused because I was editing this file when r1377 was committed which probably was merged wrongly with my changes)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1379 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-05 20:25:21 +00:00
Giel van Schijndel de5510938e * get rid of unused priority queue implementation (lib/gamelib/queue.[ch])
* remove an unused variable from lib/ivis_opengl/piemode.c
 * some code refactoring to increase readability, change if branches that handle error conditions to the folowing style:
    if (error)
    {
        deal with the error;
        return something (usually false or 0);
    }
    
    continue with normal execution path;

 * previously was something like: if(not error) {normal execution path;} else {deal with error;}; the above way groups error detection and handling which is more easily readable/understandable
 * wrap some if branches from r1374 with curly braces according to Per's advice on the dev mailinglist
 * completely get rid of iPriority from struct TRACK (also stripped it out of functions' argumentlists) since the only code that seemed to use it is the removed priority queue implementation

PS someone might want to look at lib/gamelib/audp_parser.y to finalize the modification to audio_SetTrackVals there, I'm not sure whether it will break any code/script if I would simply remove values from the parameter list, so I'm leaving it as is for this moment

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1378 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-05 20:19:58 +00:00
Per Inge Mathisen 640e7be2a9 Sound code: Some code cleanup and removal of unused code. Also fix an assert
that was broken in several ways.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1377 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-05 19:42:00 +00:00
Dennis Schridde e8de4b9927 - Purged English strings from Norwegian translation (Sorry if something is missing, I removed everything that looked english).
- Tiny update to german translation
- make -C po update-po


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1376 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-05 19:28:10 +00:00
Dennis Schridde 6d0ddd3cdd Danish translation by Karmazilla (Christian Vest Hansen).
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1375 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-05 18:51:56 +00:00
Giel van Schijndel a72ecb62fd * remove some else branches to inrease code readability (code itself should function exactly the same)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1374 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-05 18:43:42 +00:00
Dennis Schridde 2650c696a5 Kills->Abschüsse (by Thomas Rast)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1373 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-05 18:29:07 +00:00
Giel van Schijndel c80d5dba3c * document audio_SetTrackVals (doxygen)
* remove some unnecessary else branches in audio_SetTrackVals (the if respective if branches really only where error handlers which caused the function to return anyway)
 * rename some things in audio_id.c to a more explaining name (i.e. the struct and its members)
 * fix some serious abuse of tabs ('\t') in audio_id.c, while the file looks partially good with a tabsize of 4, it looks awful with a tabsize of 8

PS audio_id.c's sole duty seems to be to map sound events to audio files, for the sake of moddability I think we ought to move this out of sources and into scripts.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1372 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-05 18:14:18 +00:00
Dennis Schridde e499051623 Update Debian ruleset, patch by Jocke
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1371 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-05 17:40:30 +00:00
Dennis Schridde 4261c7e0ae Move scriptlang.htm to where it can be found.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1370 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-05 17:36:59 +00:00
Dennis Schridde 6f332421c6 Small change to match branches/2.0
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1369 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-05 17:30:39 +00:00
Dennis Schridde e718c24567 - Fix a typo in german Windows installer descriptions
- Fix DATADIR


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1367 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-05 17:20:15 +00:00
Gerard Krol a90d28305b Remove the heap system from message.c and fix an assert about a message that could not be found.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1366 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-05 16:59:29 +00:00
Gerard Krol f887de8c8f 1. Now only transparent objects are rendered by the bucket sort. 2. Added some asserts to check if droids stay on the map.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1365 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-05 15:24:03 +00:00
Gerard Krol 7d6382905d Fix some problems introduced in r1286: 1. flickering water edges 2. transparent water was not correctly drawn
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1363 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-05 14:32:13 +00:00
Gerard Krol b8c4065e15 1. Fix an assert when winning or losing a skirmish game. 2. Remove some debug messages 3. Now display the mission result screen on the end of a
skirmish/multiplayer game.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1359 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-04 11:17:48 +00:00
Per Inge Mathisen d19a616013 Add gettext.m4 for users who might now have it installed for some reason.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1358 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-03 18:25:40 +00:00
Stefan Huehner 8c517891ea Remove the font.h header file (which had no implementation)
Remove all callers (which all were commented out)
The 'real' font implementation used lives in ivis_



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1357 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-03 18:14:24 +00:00
Stefan Huehner 7c9f1d19af Remove some unused function prototypes.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1356 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-03 17:33:38 +00:00
Stefan Huehner fef987633f Convert some more strresGetString calls to using the
new gettext style. As per Mailinglist post
'Gettext - part2'




git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1355 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-03 17:31:30 +00:00
Giel van Schijndel b42cbb0b94 * change inlines of r1353 into static functions according to advice from Per and Stefan on the dev mailing list
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1354 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-03 17:10:45 +00:00
Giel van Schijndel 84bfec1742 * turn some macrofunctions into inlines
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1353 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-03 16:19:15 +00:00
Gerard Krol 39b4a1da37 Remove a some "temporary" checks from defenseLocation that were causing asserts. The AI doesn't seem to care, and happily builds defenses.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1352 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-03 15:36:25 +00:00
Gerard Krol aadc399453 The function asciiKeyCodeToTable from keymap.c was returning invalid table indices.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1351 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-03 14:55:28 +00:00
Dennis Schridde b2ca1a6825 Autopoint removal by Per.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1350 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-03 14:04:21 +00:00
Gerard Krol 7f73a0b730 Remove a debug statement that I left behind.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1349 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-03 13:35:57 +00:00
Giel van Schijndel 26f2672bfd * remove macro PTRVALID
* replace all instances of PTRVALID(ptr,size) by (ptr != NULL)
 * remove asserts of style ASSERT( x == NULL || x != NULL ) because they would evaluate to true always anyhow and as such wouldn't ever trigger
 * remove macros iV_HeapAlloc and iV_HeapFree and replaced them with MALLOC and FREE respectively (that's what they expanded to anyway)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1348 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-03 13:20:41 +00:00
Gerard Krol 021b489038 Fix the E3 demo, which crashed by selecting a negative player number to follow a droid for.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1347 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-03 12:58:00 +00:00
Stefan Huehner 0e396d1f6a fix the build.
Remove the block.c and mem.c lines from POTFILEs.in as
well, as these files where removed completely.



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1346 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-03 11:51:51 +00:00
Giel van Schijndel 13c85370b9 * enable libvorbisfile to seek into a file opened with PhysicsFS
* also allow this to be disabled on a per file basis (this code is basically taken from the sound branch: lib/sound/decoding.cpp)
 * some minor code cleanups (using a temporary to cast into, rather than casting directly into a function call's parameters, optimizer will optimize this away anyhow)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1345 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-03 11:15:41 +00:00
Gerard Krol 50effcd212 Fixes an assert when loading a map preview. (gateways were being calculated without the terrain types correctly set up)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1344 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-03 11:12:00 +00:00
Gerard Krol 42ed587327 Per's removal of the memory heap system. Now MALLOC is just malloc, and not some wrapper around a wrapper that will allocate it from a specific pool.
The MSVC poject will need to be updated I guess, as some files were deleted.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1343 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-03 10:33:26 +00:00
Giel van Schijndel fe90b5374a * apply patch found in bug #6953 by David Brettle
NOTE: this does not fix the issue of the close button not flashing, it does however make this script request it to be flashed (as in, one down, on to go).

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1342 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 23:27:57 +00:00
Giel van Schijndel a61dcf5a50 * set mime-types on data:
*.ogg -> application/ogg
  *.jpg -> image/jpeg
  *.png -> image/png
  *.svg -> text/xml

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1341 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 22:39:14 +00:00
Giel van Schijndel 2465969014 * allow viewing in any browser directly from the svn-http url ( http://svn.gna.org/svn/warzone/trunk/data/multiplay/skirmish/scriptlang.htm )
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1340 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 21:49:03 +00:00
Dennis Schridde 07f6c04ecd Sensor targeting fix by Thomas Rast
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1339 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 20:51:08 +00:00
Giel van Schijndel 0730665b1e fix raw makefiles
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1338 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 20:49:14 +00:00
Dennis Schridde ea74165cec A little bit more strings.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1337 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 20:09:11 +00:00
Dennis Schridde 3867e71196 Very basic german translation.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1336 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 18:58:28 +00:00
Per Inge Mathisen 2f6baa8b8a Check separately for gettext, and give hopefully informative message when
only autopoint is missing. Also run autopoint with --force option to avoid
stupid errors.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1335 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 18:30:04 +00:00
Dennis Schridde f2eb836b61 - Remove unnecessary files in m4
- Fix autopoint detection in autogen.sh
- Require only gettext 0.14 in configure.ac


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1334 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 18:08:23 +00:00
Dennis Schridde 874f421a25 Add autopoint, autoconf and automake checks back in...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1333 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 17:48:14 +00:00
Dennis Schridde 3b09a756df - Remove unneeded gettext files and instead create them via autopoint
- Remove unneeded checks from autogen.sh (all of them are also checked in configure.ac)
- Move AM_CPPFLAGS=-$(top_srcdir), which was included in nearly every Makefile, to configure.ac
- Remove -g from CFLAGS for usual builds. This should be set by the buildscripts instead
- Remove CFLAGS_OVERRIDE, which was rendered obsolete by the above change


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1332 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 17:21:05 +00:00
Gerard Krol 71b4cb283b Bugfix: Can now properly save the game when sound is disabled. (this caused an assert)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1331 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 15:21:30 +00:00
Dennis Schridde bd9eda5a69 Makevars had double content
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1330 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 15:00:10 +00:00
Dennis Schridde f2b9e42484 Make NSIS uninstaller delete ChangeLog and Authors files
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1329 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 13:18:38 +00:00
Dennis Schridde 0aa7cd1b8c Comply with the gettext manual and move path fallbacks to the common location
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1328 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-01 21:15:07 +00:00
Per Inge Mathisen 6f32003a02 Start removing unused droid program component code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1327 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-01 21:01:29 +00:00