Commit Graph

805 Commits (57674e35456f2add5c236429db20e5e06deff7b4)

Author SHA1 Message Date
Dennis Schridde bf26411158 Don't forget to ship the data with the AutoPackage.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1025 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-21 18:44:36 +00:00
Dennis Schridde 73121112c9 - Finally Win98 compatible again!
- We apparently missed a contributor in the AUTHORS file...


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1023 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-21 18:15:18 +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
Dennis Schridde 537df742b2 Updated Authors
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1013 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-15 20:08:00 +00:00
Ari Johnson 6a8b7424c9 Fixed syntax error - missing semicolon on end of line
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1010 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-15 16:49:16 +00:00
Dennis Schridde 0f0da23e46 Raw Makefiles: Compatibility fix for make versions < 3.81
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1009 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-15 13:26:01 +00:00
Dennis Schridde 819277a878 Proper include fix.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1004 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-13 23:23:59 +00:00
Dennis Schridde 8636f63a4c Raw Makefiles: Forgotten support for mingw32 libaries
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1003 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-13 21:16:18 +00:00
Dennis Schridde 52f1b21e24 Raw Makefiles:
- Check for MAKENSIS if INSTALLER is set
- Seperate windows-support from mingw32-support


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1000 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-13 20:55:33 +00:00
Dennis Schridde adee432d8e - Set Gamma in systemInitialize instead of loadConfig
- Load config before grabbing commandline parameters and save them right afterwards


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@998 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-13 01:48:48 +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 16d456837b Fix Win98-without-IE5-fallback.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@992 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-10 21:38:15 +00:00
Dennis Schridde 324a35d1d9 Compatibility fix for Win98 without IE5.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@987 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-10 00:36:16 +00:00
Dennis Schridde d8f790fd7d Additional includepaths-workaround for non-debug variant.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@986 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-09 23:11:36 +00:00
Dennis Schridde a43cf9bfb2 - Relative/Templated paths for MSVC
- Waf wscript


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@985 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-09 23:01:15 +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
Dennis Schridde 6118395dfc Stop confusion: COMPILER also removed from config.mk.tmpl
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@980 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-09 01:34:38 +00:00
Dennis Schridde 2e967ee264 More merging and Makefile improvements:
- Remove (wrong) double definition of main
- Make enabling/disabling of DATA and INSTALLER easier in raw Makefiles
- Remove COMPRESS and COMPILER from raw Makefiles
- MAKENSIS is no longer mandatory for raw Makefiles


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@979 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-09 01:28:01 +00:00
Dennis Schridde f28630f634 Forgotten change
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@978 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-08 23:48:12 +00:00
Dennis Schridde 027b868929 Change libraries for raw Makefiles again. This should now more closely represent the sdl-config.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@976 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-08 23:25:38 +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 28d4e32d59 apply proper use of enums (i.e. not defining the current value to be the previous one +1)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@974 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-08 18:51:12 +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 9c79b6b109 ISO C 90 (or C-99 without GNU-extensions) compatibility fix:
* change all casts using the typeof() keyword to their respective typename
 * append a compiler flag for GCC (-fno-gnu-keywords) which disables GNU-specific keywords (typeof and asm only in case of C-99, inline as well if C-90 mode is used), to aid in code portability (i.e. among compilers)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@970 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-08 12:42:51 +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 dc59e61b9e -fixed assert and debug message
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@968 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-07 20:15:07 +00:00
Roman C 3336e8717a AI update:
-AI can now request help using chat messages when in trouble.
-AI can recognize other players (Humans or AIs) asking for help and react accordingly by sending units to help ally - indicate position on the map with a beacon (Alt+H) and send a chat message requesting help.

Example:
"Help"
Addresses all players sender communicates with.

Certain AIs can be addressed directly:
"Black, Red and SantaClaus help me!!!"

-"i'm fine" or similar forms understood by lexical parser will notify AIs to send its units back.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@967 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-07 20:11:50 +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
Roman C 80a5a97366 Disabled ability to click on help blips - this seem to cause ugly GFX artefacts sometimes, text could not be manually set by players anyway.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@965 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-07 19:36:58 +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
Roman C d96cc304b1 Fixed a crash when a cyborg mechanic gets destroyed.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@963 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-07 19:08:23 +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
Dennis Schridde 37c74739a2 Patch by Shurcool: Selection Box:
1) [FIX/ADDITION] the selection box is now filled in with a translucent shade of grey, like Pumpkin Studios intended it, but it wasn't working due to a bug. Can be disabled with the --noTranslucent command line parameter (theoretically along with all other transparency effects, but in practice it doesn't seem to affect anything else because the check for war_GetTranslucent() is not used anywhere else).
2) [FIX] the selection box now always pulses consistently inwards, no matter in which orientation you drag it (ie. from top-left to bottom-right, from bottom-left to top-right, etc.)
3) [FIX] the selection box doesn't flash/disappear momentarily sometimes when the mouse cursor is positioned at the very edge of the screen anymore


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@961 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-07 13:16:02 +00:00
Giel van Schijndel c898c17ecb * fix compiler issues with non-C99 conforming compilers
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@960 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-05 18:00:46 +00:00
Roman C c89cadfb97 Added a script function to perform up to 8 (instead of just 1) structure iterations at the same time;
initEnumStructB() - to initialize iteration, enumStructB() - to iterate.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@959 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-04 21:47:12 +00:00
Giel van Schijndel e2de942f02 * fixed some compiler warnings
- except for script and sound all libs can now be compiled using -Werror (means they generate no warnings) and without -fpermissive except for the files generated by flex
  - netplay/netplay.c: changed variable size from unsigned to signed according to SDL spec ( http://www.libsdl.org/cgi/docwiki.cgi/SDLNet_5fTCP_5fSend )

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@958 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-04 20:24:26 +00:00
Giel van Schijndel 851b570bc5 * functions memRecReport & memMemoryReport:
- removed these functions and all calls to it if REALLY_DEBUG_MALLOC isn't defined, because they don't do anything currently when REALLY_DEBUG_MALLOC isn't defined
  - moved the declaration of memRecReport from memint.h to mem.h where it is, together with memMemoryReport, optionally declared depending on REALLY_DEBUG_MALLOC
 * fixed yet another set of signed/unsigned errors (src/seqdisp.c & textdraw.c/h)
 * removed a cast from char* to char* (that's what I call unnecessary; transforming something into something it already is)
 * memory system:
  - added some comments to clarify what certain pieces of code actually do
  - removed some redundant code (e.g. why would you ever want to overwrite memory to zero just before passing it to free()?)
  - made debug-version of free() return immediately when being passed a NULL pointer (i.e. after raising an assert)
  - moved some variable declarations down to the first point of usage
  - *IMPORTANT*: commented the definition of MEMORY_SET out (line 38 mem.c), this might break code that expects freshly malloc'ed memory to be pre-initialized, if you experience any problems due to commenting this out please say so on the mailinglists!

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@957 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-04 18:41:24 +00:00
Roman C bebc8316da -fixed FLEX YY_CURRENT_BUFFER glitch
-added asserts to some scripting functions

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@956 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-04 18:15:17 +00:00
Giel van Schijndel 3d23a48076 * expand the use of compiler-guards (C preprocessor macros) so that not only the forward declarations and referring macros are guarded, but the referred functions as well
* remove some unused things: variables, macros (MEMORYREPORT, MEMORYTREAP)
 * fix some signing errors:
  * change assignments of/comparisons with -1 to unsigned variables ((-1) directly, not through a preprocessor directive) to ~0 (left OpenAL-code alone)
  * remove some casts to (SDWORD) in comparisons which actually cause signed/unsigned errors rather than fix them
  * redefine some vars as unsigned

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@955 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-04 17:03:32 +00:00
Dennis Schridde 33798e384a Multiplayer Command Turrets can now attack/mark air targets. This makes it sensible to attach AA weapons to commanders for defensive purposes.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@954 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-04 14:42:40 +00:00
Dennis Schridde 7c816b265c Crashfix
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@953 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-04 14:41:22 +00:00
Giel van Schijndel 860983318c * Set the bugtraq properties on the nsis directory as well
* Set svn:ignore to:
  * include files which should only occur in a working copy (e.g. makerules/config.mk which is derived from makerules/config.mk.tmpl)
  * prevent files produced by the build-system (e.g. files generated by bison and flex) from showing up in `svn status'

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@952 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-03 23:20:44 +00:00
Dennis Schridde e25d5f511b Patch by Giel: NSIS uninstall info extension:
- This patch adds some additional info (including an URL to http://wz2100.net/) to the MSW Add/Remove software section.
Some additional variable reordering by me.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@951 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-03 19:47:09 +00:00