Commit Graph

298 Commits (d3cadd9e4a510c73a985042da4e3d1b0df1333b9)

Author SHA1 Message Date
Per Inge Mathisen d3cadd9e4a Start making the code conform to -Wextra
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1146 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-19 16:46:48 +00:00
Per Inge Mathisen 79b3875fc4 This commit fixes all warnings (on my system). -Werror added for
debug builds. Hopefully this will not cause too much pain, but
rather increase code quality for the future.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1144 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-19 14:10:44 +00:00
Per Inge Mathisen 929c4bf2ab Set eol-style for files missing this.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1143 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-19 14:02:24 +00:00
Per Inge Mathisen 9640c6a42d Fix mixed line endings
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1142 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-19 14:01:41 +00:00
Per Inge Mathisen 714d15e7e8 Attempt to fix mixed line endings.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1141 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-19 13:57:33 +00:00
Per Inge Mathisen fa54b61973 Cleanup of fractions.h
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1140 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-18 22:57:33 +00:00
Giel van Schijndel 3880422cbe copied some code from branches/sound/lib/sound/decoding.cpp
This allows files to be decoded by OggVorbis directly through PHYSFS. Previously PHYSFS was used to read the entire file into memory and then to decode it from that memory buffer.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1138 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-18 22:16:55 +00:00
Giel van Schijndel b73646d04b * improve code readability (e.g. only keeping the `if (malloc(...) == NULL) handleError;` part, so as not to wrap all the rest of the code in a big (recursive) else block
* remove function `static void sound_SaveTrackData` because the operation it performs doesn't justify a whole function (and its calling overhead)
 * some cleanup in functions sound_ReadTrackFromBuffer and sound_ReadTrackFromFile
  * commented operation of both functions 
  * moved the content of function sound_SaveTrackData (only one statement) to sound_ReadTrackFromBuffer
  * modified sound_ReadTrackFromFile to not allocate double the size of the needed memory for a buffer

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1137 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-18 21:30:51 +00:00
Per Inge Mathisen 3a1d1a6069 Clean up pieclip.c, based on patch by Gerard Krol.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1136 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-17 23:03:48 +00:00
Per Inge Mathisen 85dbcef6af Cleanup of textdraw.c, removing pie_DrawTextToSurface(), which was
redundant, as Gerard Krol reported.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1135 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-17 22:39:33 +00:00
Per Inge Mathisen 34ad7b89e9 Some cleanup of piedraw.c (and more or less related fixes), includes
a reduction of duplication fix from Gerard Krol.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1134 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-17 22:29:21 +00:00
Per Inge Mathisen d68164d3af Smaller texture cleanup. Fix bug in debug log call parameters.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1133 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-17 21:33:10 +00:00
Per Inge Mathisen 9f16833e30 Small cleanup of texture loading and handling, removing unused
portions of the code.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1132 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-16 23:19:33 +00:00
Per Inge Mathisen e0a80da628 Remove unused header
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1131 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-16 22:54:18 +00:00
Per Inge Mathisen f5b266c722 Remove excess conversion to lowercase of imd filenames and function
to do so.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1130 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-16 22:49:56 +00:00
Per Inge Mathisen 1f88208c8c Fix Makefile.raw too
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1129 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-16 22:33:46 +00:00
Per Inge Mathisen b46d680987 Remove lib/ivis_common/bug.c|.h, containing unused logging
functions of dubious usefulness. The log calls are still
present, with protos in ivi.h, in case someone wants to
build something better with them.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1128 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-16 22:31:52 +00:00
Dennis Schridde 8a70df4064 Use some more advanced Automake techniques like noinst_HEADERS. Changes partly autogenerated by KDevelop, so this should be compatible with Automake 1.6.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1118 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-16 14:36:03 +00:00
Roman C cd70a98588 - fixed compilation of script functions consisting of a single return statement
- minor cleanups

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1112 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-14 22:12:48 +00:00
Giel van Schijndel 35de2b63f1 * get rid of lib/ivis_common/geo.h (only had one line, which effectively made it a symlink to another include file)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1110 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-14 20:13:31 +00:00
Roman C da3f1e25f8 - removed some ASSERSs doubling debug() error output
- when script runtime error occurs wz first outputs error information and then asserts, not vice versa
- printCallStack() script function will output script call stack to standard output

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1107 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-14 18:29:26 +00:00
Ari Johnson 05bd724b1c Fixed script state saving and loading on big-endian machines
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1100 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-14 03:39:17 +00:00
Roman C 1ac2942948 Make use of the script type compatibility table during compilation of vlo and slo files.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1098 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-12 15:46:54 +00:00
Roman C f4c4c48dd2 Patch by Gerard Krol:
replaces AND/OR macros with &&/||

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1089 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-10 16:39:39 +00:00
Roman C f13a111a5c Scripting engine update:
-added script call stack trace output on script runtime error
-added STRUCTURE getTileStructure(INT tileX, INT tileY) script function to get a structure on a certain map position
-fixed two stackPopParams() calls with too many actual parameters

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1087 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-10 15:23:47 +00:00
Dennis Schridde f105fad779 Improved backdrop-loading and don't delete a texture when it just needs to be replaced.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1085 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-10 14:34:12 +00:00
Giel van Schijndel 991b9ceb12 patch by Gerard as provided in message with ID <45CC4A2E.4060706@student.tudelft.nl>:
* fixes usage of negative array index

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1082 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-09 16:29:32 +00:00
Dennis Schridde 977b2ee558 - Hack in PNG backdrop loader
- Add 2 new backdrops from Terminator (http://wz2100.net/forum/index.php?topic=109.0)
- Remove unused pal parameter from pie_PNGLoadMem()


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1075 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-07 15:27:17 +00:00
Dennis Schridde 04359c9abc SDL_framerate is not part of Warzone 2100, not licensed under the GPL, but instead under the LGPL and even comes with it's own header.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1071 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-06 13:30:46 +00:00
Dennis Schridde 2b16cbd06b Port of r1066
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1067 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-05 14:32:31 +00:00
Giel van Schijndel 7250eff5b6 * Remove yet another set of unused (or empty) functions
* Remove an unused, local, function-variable
 * Remove some file-global, static variables

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1051 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-29 23:17:46 +00:00
Giel van Schijndel 4def8b89ba Fix some compiler warnings:
* remove some unused functions

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1049 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-29 22:17:40 +00:00
Ari Johnson 26158abb0c Endianized colors for vastly better big-endian version
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1047 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-29 05:42:26 +00:00
Per Inge Mathisen 3d6771a521 Unify the several different definitions of pi in the codebase. Now we use the
C macro M_PI (if available, or we will define it on our own in fractions.h).


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1033 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-24 19:42:20 +00:00
Giel van Schijndel 731c145b75 removed alGetError() error-check because an al* error couldn't be legally generated at this stage since no al* calls are made yet
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1018 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-17 22:18:59 +00:00
Giel van Schijndel 5bcc7819ac git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1017 4a71c877-e1ca-e34f-864e-861f7616d084 2007-01-17 21:39:38 +00:00
Dennis Schridde 49ceba7503 Add GPL notices to all sourcecode files.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1014 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-15 20:09:25 +00:00
Per Inge Mathisen 85767a6ae8 Remove the unused (unconfigurable) CD soundtrack code, since we now
anyway prepare to add our own, new music tracks to the game.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@997 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-10 23:00:04 +00:00
Per Inge Mathisen a0c67a74c1 While I am at it, remove some more dead code and set correct log flag.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@996 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-10 22:50:09 +00:00
Per Inge Mathisen 6856fab9de Fix autoconf build system that was broken in commit 994.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@995 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-10 22:38:55 +00:00
Giel van Schijndel c3276dcf59 last commit only emptied lib/sound/mixer_stub.c
fix that by deleting it now

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@994 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-10 21:56:50 +00:00
Giel van Schijndel 1591402b4c removed lib/sound/mixer_stub.c and all function calls to it (or more precisely the calls to its empty functions)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@993 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-10 21:55:39 +00:00
Dennis Schridde f723a42e50 Proposed fix for non-MSVC buildsystems
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@984 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-09 22:07:58 +00:00
Dennis Schridde 711af01772 New MSVC project files with custom build rules to support automatic lexer/parser generation.
The include changes might break other buildsystem, I'll fix that when I am back on Linux.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@983 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-09 21:13:58 +00:00
Giel van Schijndel 340710edf8 workaround for bug #8198
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@975 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-08 22:35:43 +00:00
Giel van Schijndel 38a3d8ee82 * cast some void*(*) variables to their respective types
* remove -fno-gnu-keywords from GCC because it seems to be only for C++/ObjectC (Doh!), and the variant for C (being -fno-asm) additionally disables inlines which we definitely don't want disabled
 * remove a large function which reserves memory without it ever being used *at*all* (from hci.*, mapdisplay.* and intelmap.c), also remove a function parameter from another function in mapdisplay.c, (it was this parameter that required the other functions to reserve memory)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@971 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-08 13:40:12 +00:00
Giel van Schijndel 68d435097e enabled some more code to compile with a C++ compiler without -fpermissive (i.e. there should be *less* compile-time errors now)
* moved several #defines to the enums where they belong
 * changed some datatypes on declaration
 * prepended casts to malloc calls (using typeof() style)
 * changed some (void*) casts to (void**) where required
 * removed several #defines and there instances and then replaced them with their corresponding values from an enum

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@969 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-07 23:50:30 +00:00
Roman C ddbc2564b5 Lexical parser update:
-Fixed endless recursion in one of the lexical parser rules.
-Disabled log warnings when no meaningful information could be extracted form a player chat message.
-Small update to the lexical chat parser rules.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@966 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-07 19:44:04 +00:00
Dennis Schridde f1ad4d83c9 - Expand DISP_HEIGTH/DISP_WIDTH
- Remove an unused function


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@964 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-07 19:29:26 +00:00
Giel van Schijndel 241f40f5fc soundsystem fixes/improvements
* remove file-global var `ALfloat listenerPos[3]` and replaced with function calls to alListener{Get}{n}{fi}{v}( AL_POSITION, ... )
 * modified sound_SetObjectPosition() to be better human-readable (removed some unnecessary temporary vars)
 * modified sound_SetPlayerOrientation() to a more verbose writing (+Doxygen comment)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@962 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-07 16:28:54 +00:00