Commit Graph

974 Commits (2707ce0fd61152ae39bb51d269ec718d3d22fd1d)

Author SHA1 Message Date
Giel van Schijndel 092afb2a01 * remove sound_CheckSample: only contained asserts, makes debugging difficult if you don't know where the assert really came from
* moved asserts to only two callees of sound_CheckSample

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1403 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-09 12:50:48 +00:00
Giel van Schijndel d42a6ba8a4 * Fix C89 compatibility
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1402 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-09 12:25:06 +00:00
Giel van Schijndel 3c874190c7 * remove the (unused) ability to decode tracks from memory buffers
* move construction (allocation and initialization) of struct TRACK to openal_track.c where it is also decoded

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1401 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-09 12:16:31 +00:00
Giel van Schijndel 011d7187e2 * audp_parser can now only parse from a PHYSFS_file, it won't parse directly from a memory buffer anymore
* resource types ANI and ANIMCFG are now read directly from file

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1400 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-09 11:31:05 +00:00
Gerard Krol 28fe84976e Removed unused "cluster" functions from the sound code. I suppose
clusters are groups of close units.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1399 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-09 10:56:26 +00:00
Giel van Schijndel e95423ac68 * set filename from GetLastResourceFilename() in sound_ConstructTrack (this filename can at some point be read back into scripts, so it does matter how this filename is formatted, since loading from buffer originally used that function, we now use it for both file loading and buffer loading)
* change audp_parser/lexer to be able to read directly from a file (through PHYSFS)
 * change data.c's mapping for "AUDIOCFG" to use the parsing directly from file
 * rename dataAudioLoadFile to dataAudioLoad
 * add a second list with load function mappings to audio.c for load from file mappings
 * add a second piece of iteration code for the file mapping list

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1398 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-08 23:25:48 +00:00
Giel van Schijndel 99153c743c * remove some dead code (resource preload callback stuff)
* turn a one-statement function into an inline (resDoResLoadCallback)
 * revive resource loading from file (the function pointer for this was removed in r1394, to actually use this pointer new code had to be written)
 * modify resDataInit to handle memory allocation as well as data initialization
 * modify struct RES_DATA to not have a fixed size char array to contain the filename (is now dynamically allocated together with the rest of the struct, see resDataInit)
 * modify some argument lists to take `const char*` instead of `char*`
 * change resLoadFile to use RES_TYPE.fileLoad if available, also remove an unused if statement (well actually the condition could never be false)
 * resource type "WAV" (see data.c) now directly loads from a file (rather than copying the file entirely into memory and then to operate on that)
 * fix sound_ConstructTrack (track.c) where I used the wrong source to copy the filename from
 * fix sound_LoadTrackFromBuffer (track.c) to *not* add the track to the tracklist because this breaks other code
 * modify sound_ReleaseTrack (track.c) to gracefully deal with NULL pointers
 * remove dataAudioRelease (data.c) and instead just use sound_ReleaseTrack

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1397 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-08 21:39:24 +00:00
Giel van Schijndel 61975a7936 * Fix a missing semi-colon r1395
* Change some calls to FREE(TRACK*) to free(TRACK*), because TRACK is always allocated using malloc
 * Change only one instance of MALLOC and only other instance of FREE in lib/sound/track.c to malloc and free respectively

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1396 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-08 19:01:19 +00:00
Giel van Schijndel dfa8d64f27 * modify construction functions of TRACK to return pointers instead of BOOLs (and if we return a NULL pointer we first free the original memory, previous code would leak if errors would occur during construction)
* remove wrapping function audio_LoadTrackFromFile from lib/sound/audio.c
 * move similar code in sound_LoadTrackFromBuffer and sound_LoadTrackFromFile to a static inline: sound_ConstructTrack (lib/sound/track.c)
  * this code also allocates memory for a TRACK and a string using one malloc call, this to make one free call sufficient for cleaning those up (they should _always_ be free'd together anyway, which previously was *not* always the case: memleaks)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1395 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-08 18:51:15 +00:00
Giel van Schijndel 10964ceca2 * remove unused function pointer fileLoad from struct RES_TYPE in lib/framework/frameresource.h (there is code that sets this member, but none that uses it)
* remove function resAddFileLoad from lib/framework/frameresource.[ch] which was used to set RES_TYPE.fileLoad
 * remove only call to resAddFileLoad from src/data.c, function dataInitLoadFuncs
 * remove now completely unused function dataSaveGameLoad from src/data.c
 * modify function dataInitLoadFuncs in src/data.c:
  * modify the struct definition for the list of resource types
  * modify the list accordingly
  * remove the NULL-item from the end of the list
  * modify list iteration code to use a start and end iterator (end being a pointer just past the last valid list-item, begin being the first valid one)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1394 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-08 17:15:56 +00:00
Giel van Schijndel 0af269415c * remove some linked list wrapping macro (to increase code readability)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1393 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-08 15:35:00 +00:00
Giel van Schijndel 645c5852c8 * Add some info about revision info (last author, commit date and revision) through svn keywords
* This way updates to this file will automatically modify the above automatically

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1392 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-08 14:41:25 +00:00
Roman C 0faf85229b Scripting Language:
-simple data types are lowercase on default
-casts using uppercase still allowed for compatibility with campaign scripts
-updated scripting manual accordingly

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1391 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-08 13:27:41 +00:00
Gerard Krol 6671fa934e 1. Removed the terrible memory leaks from the resource system. 2. Fixed the memory leaks for the terrain tiles. 3. Fixed a lot of uninitialised
variables. 4. Commented out some unused sound code.
I just love Valgrind :)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1390 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-07 13:23:14 +00:00
Dennis Schridde 4003b2dc95 Due to popular request: Standardinstallation
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1386 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-06 12:47:41 +00:00
Giel van Schijndel e1a839ced5 * add gettext generation support to raw makefiles (is far from nice, but works)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1385 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-06 01:51:07 +00:00
Dennis Schridde 0924497ba5 "do we really need all files listed twice there?"
- No we don't
- Another update-po just to be sure


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1384 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-06 00:45:02 +00:00
Giel van Schijndel 99adbf5010 some additional translations for NL
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1383 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-06 00:39:18 +00:00
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