Commit Graph

1206 Commits (4d96fb962de0527375a1b6479c891ae4b771faf8)

Author SHA1 Message Date
Dennis Schridde 0bba8687ee Remove AM_GNU_GETTEXT_VERSION since that was only used by autopoint.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1435 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-10 19:59:19 +00:00
Stefan Huehner 796eb23f27 remove buildpos.c and buildpos.h which are completely
enclosed by comments and have been since r1 (Initial Version)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1434 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-10 19:02:02 +00:00
Stefan Huehner 932ecd9f05 remove forward declarations from source file which are
picked up from corresponding header.



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1433 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-10 19:01:16 +00:00
Giel van Schijndel fd1ed75a3b git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1432 4a71c877-e1ca-e34f-864e-861f7616d084 2007-04-10 18:34:50 +00:00
Stefan Huehner aa1cb2ec14 Remove references to already removed header files
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1431 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-10 18:29:58 +00:00
Stefan Huehner 00286d398b Update Makefile.raw after ani.c removal
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1430 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-10 18:17:03 +00:00
Stefan Huehner f33eeb1413 inline the only function from ani.c in its only user (init.c) and remove
ani.c and ani.c altogether



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1429 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-10 18:13:08 +00:00
Stefan Huehner e40142efcb Remove the unused ptrlist implementation from gamelib
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1428 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-10 18:01:06 +00:00
Stefan Huehner 58869ba54d Remove 2 unused function declarations
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1427 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-10 18:00:33 +00:00
Dennis Schridde 697ccff2b6 Require gettext 0.15 here, too.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1426 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-10 17:57:51 +00:00
Stefan Huehner 72e455e1a5 The powercrypt module prevented cheating power-value
in ram by storing a encrypted value and checking against
this.
It not of use anymore as the client is completely 
open-sourced now...
Removing the module and all references



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1425 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-10 17:43:46 +00:00
Stefan Huehner 61622e29e4 Remove an unused define UNITS_PER_PLAYER
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1424 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-10 17:41:48 +00:00
Dennis Schridde 751e6c44f7 Use pgettext instead of a custom implementation.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1423 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-10 17:36:16 +00:00
Stefan Huehner a641ac9381 remove aidef.h header and its references, as the only
user was in a comment



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1422 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-10 17:11:10 +00:00
Stefan Huehner 9eda7db8a1 Code-Cleanup: remove a lot of type,function,variable
declarations/definitions which are not used anywhere.



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1421 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-10 17:01:53 +00:00
Giel van Schijndel c0fd40ff19 * revert changes of r1418 to droid.c and multiplay.c ( N_ macro was removed )
* since gettext_noop is always defined, remove the conditional definition of N_ which checks whether it is or is not defined

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1420 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-10 17:01:37 +00:00
Stefan Huehner 4d88263c9b Add registry_clear() to declarations, as it is exported
and used by other code.




git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1419 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-10 16:59:47 +00:00
Dennis Schridde 3c6c7b5b51 Cleanup
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1418 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-10 15:29:27 +00:00
Giel van Schijndel 79d4169bcd * fix two warnings in exceptionhandler.c
* add Q_ and Qn_ gettext macros (copied from Freeciv: GPL)
 * remove hack for ambiguous translations from droid.c; use Q_ instead
 * update makefiles accordingly
 * `make -C po update-po`

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1417 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-10 14:06:14 +00:00
Per Inge Mathisen 96cb7cafc5 Ressurect -Wno-unused-label. Reorganize string.h includes so that
_GNU_SOURCE can take effect first, to silence stpcpy() warnings from 
bison generated code.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1416 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-10 12:44:50 +00:00
Giel van Schijndel c31f807b94 * insert a hack into droid.c to circumvent ambiguity of the word "Green" (which is being used as a rank name as well as the color)
* `make -C po update-po`

PS The most feasible solution other than the above mentioned hack seems to me to use different gettext domains, I'm not sure how that should be implemented though

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1415 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-10 12:44:07 +00:00
Giel van Schijndel c3914a6ab2 * add the gettext no-op macro N_(string)
* use it in src/droid.c
 * throw some hardcoded strings (in a switch statement) in an array of strings instead (using N_ there as well)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1414 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-10 12:31:13 +00:00
Roman C e8e196f98e Fixed scorpion body having no VTOL and Wheeled propultions assigned in MP games.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1413 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-10 10:59:52 +00:00
Giel van Schijndel 365c37812d * Remove PIEPIXEL and change all of its instances to Vector3f (definition is exactly the same where types are concerned, only member vars were named different)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1412 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-10 10:47:20 +00:00
Roman C 153cb45fa6 Also fix the campaign version of templates.txt
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1411 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-10 10:33:27 +00:00
Roman C 459c66975e Fixed a VTOL template having no sensor.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1410 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-10 10:25:12 +00:00
Giel van Schijndel cc17299668 * remove internal forward declarations of functions already declared in the header
* use proper constness:
  * make some functions take arguments of `const char*` rather than just `char*` (also modified some functions' return values to return `const char*` where appropiate)
 * modify rank retrieval functions to use a central array instead; currently ranklimits (i.e. the amount of kills required to promote) is hardcoded in switch statements, as is the case with the names of those ranks
 * `make -C po update-po`

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1409 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-09 22:09:27 +00:00
Dennis Schridde b3e17f6064 Make strict the default debug mode.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1408 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-09 19:31:29 +00:00
Giel van Schijndel fc701e9595 * remove unused priority parameter from script function audio_module::audio (audio_track)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1407 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-09 17:45:30 +00:00
Giel van Schijndel ee27f41be7 * add -Werror-implicit-function-declaration to CFLAGS
* Fix a spelling error in a string in src/droid.c
 * `make -C po update-po`

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1406 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-09 15:02:04 +00:00
Dennis Schridde 8952155c7a - Add -Wextra to debug=yes, as it doesn't generate so many new warnings
- Add -Wno-nonnull to debug=strict to make it compile (Remove it from AM_CFLAGS)
- Remove -Wno-unused-label as this warning is not generated anymore
- Fix a "... from incompatible pointer type" warning which led to a lot of strings (and associated functions) in the widget area becoming const
- Maybe found the reason for images in UTF-8 strings


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1405 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-09 14:41:22 +00:00
Giel van Schijndel 80c250fd27 * merge 1364:1404 from trunk into branches/sound
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1404 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-09 14:35:02 +00:00
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