Giel van Schijndel
d148172577
* Remove lif/ivis_opengl/pietexture.c from the POTFILES.in list to complement r2820
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2824 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-15 17:54:31 +00:00
Giel van Schijndel
5bcb0e9ced
* Update MSVC project
...
Patch #852 by Buginator
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2823 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-15 17:45:15 +00:00
Per Inge Mathisen
fb9d667895
Clean up screen.c - make globals static and remove unused vars.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2822 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-14 22:29:19 +00:00
Per Inge Mathisen
f577a8f269
Remove unused screenGetSurface
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2821 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-14 21:05:45 +00:00
Per Inge Mathisen
50e99ae933
Remove unused pietexture.c|h files and references.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2820 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-14 19:51:04 +00:00
Per Inge Mathisen
78a9247254
Extend new savegame format to cover orders, formation, and targets.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2819 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-13 20:59:44 +00:00
Giel van Schijndel
73307a762e
* Lets use valid syntax shall we... (introduced in r2817)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2818 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-13 19:23:04 +00:00
Giel van Schijndel
714d117c71
* Add a concatenating variant of snprintf and vsnprintf, slcatprintf and vslcatprintf respectively
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2817 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-13 19:14:27 +00:00
Per Inge Mathisen
66cee9b2d5
Add more sanity checking and error description to tagfile format at the
...
cost of even less sanity for whichever poor soul who reads this code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2816 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-13 18:47:48 +00:00
Giel van Schijndel
7eaafe039c
* Fix a typo in r2814, '''flame_id''' --> '''flame_imd'''
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2815 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-12 22:19:47 +00:00
Giel van Schijndel
ff1cfed275
* Make sure to qualify `component_id` as a unique key (in table Weapons)
...
* Add tables Body, BodySize and Technology Type
* Remove Query "Armour" as it didn't yield any results anyway
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2814 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-12 22:16:42 +00:00
Per Inge Mathisen
2431ee7165
Remove dead code and improve indentation.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2813 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-12 21:31:14 +00:00
Per Inge Mathisen
a10ab88e05
Fix problem with units with attack orders.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2812 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-12 21:23:16 +00:00
Giel van Schijndel
8566e972d5
* Add some SQL statements (SQLite likes them enough) to create tables in the form of the "original" data set
...
* Set mime-type of SQL query files to text/x-sql since it is more than just plain text
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2811 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-12 19:51:24 +00:00
Per Inge Mathisen
86e2e6ffe0
Do not show mission timer or radar in intel screen, since they lead to excessive flickering.
...
Patch by Buginator in patch #846 .
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2810 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-12 19:08:55 +00:00
Giel van Schijndel
b285cdea7d
* Use vsnprintf instead of snprintf!
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2809 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-12 19:03:30 +00:00
Per Inge Mathisen
16be746f30
Clean out some dead code
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2808 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 22:19:31 +00:00
Giel van Schijndel
1bd1483944
* Use snprintf (in vasprintf) to determine the size of the string we're about to construct
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2807 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 22:09:20 +00:00
Giel van Schijndel
be25c4901b
* Modify sasprintf to take this signature instead: "void sasprintf(char**, const char* fmt, ...)" (take in mind though that it is a macro!)
...
* Add some comments to sasprintf
* Utilize sasprintf and asprintf in src/version.c to drastically cut back in code size and duplication
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2806 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 22:01:05 +00:00
Freddie Witherden
1b9b69048c
Add a stack allocating version of sprintf
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2805 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 21:29:56 +00:00
Giel van Schijndel
6486b5270b
* Add implementations of vasprintf and asprintf for Windows (GNU extensions to the C library that malloc the memory they need)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2804 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 21:12:13 +00:00
Giel van Schijndel
7711572f0a
* Add a new module (printf_ext.c) to contain some printf extensions (C99 printf variants for MSVC)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2803 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 20:58:10 +00:00
Giel van Schijndel
ff28313711
Patch #834 by Buginator:
...
* deleteSaveGame():
* Make sure to delete files from the subdirectory they're in
* Check the return value of PHYSFS_delete() and output with debug(LOG_ERROR) when an error occurred
* _runLoadSave():
* Make sDelete static, so that its value is preserved in between function calls (yes this is a dirty function which breaks Curly's law more than once)
* Only attempt to delete a savegame is there is one
Meself:
* Change the "size-specifier" of sRequestResult & sDelete to PATH_MAX instead of a magic number and a wrong constant respectively
* Utilize snprintf instead of sprintf at some places
* Add some comments to the above patch
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2802 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 20:23:38 +00:00
Giel van Schijndel
a08e6f07f8
* Provide alloca() on GCC, MinGW and MSVC (and all other WZ_OS_UNIX compilers that provide <alloca.h>
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2801 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 20:04:50 +00:00
Giel van Schijndel
ed950825a9
* Utilize the Popt library for command line parsing
...
* Add popt as a build dependency to build systems:
* autotools
* Debian package build-depends
* raw Makefiles
* Code::Blocks project file
* Make ParseCommandLine and ParseCommandLineEarly const correct
* Rewrite ParseCommandLine and ParseCommandLineEarly to utilize Popt
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2800 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 17:59:32 +00:00
Per Inge Mathisen
9472fee6ef
Fix a typo from my last commit.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2799 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 17:56:06 +00:00
Giel van Schijndel
8f3ba5029b
* Don't --disable-quesoglc while building a Debian package as that isn't an option to configure anymore
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2798 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 17:54:46 +00:00
Per Inge Mathisen
c3f5cd3183
Only psDroid->psActionTarget is actually used for multiweapon targetting.
...
psDroid->psTarget is only used for orders, where multiweapon has no meaning.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2797 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 17:20:25 +00:00
Giel van Schijndel
aef7af381e
* Make function NETsetupTCPIP const correct
...
* Don't #include <unistd.h> in source:trunk/src/clparse.c as we don't need it
* Rename a debug message to use the correct function name as prefix (bitimage.c)
* Utilize snprintf instead of sprintf, at two locations
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2796 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 17:08:41 +00:00
Per Inge Mathisen
8f9d1b640b
We do not give droids orders to attack multiple targets with multiple weapons, so there
...
is no need to store multiple targets in order code. Reverting this addition.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2795 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 16:52:50 +00:00
Per Inge Mathisen
01b13c8df3
Remove DACTION_ATTACK_M, attack with multiple weapons order. Why would you ever
...
want to attack without multiple weapons, if you have them? In any case, it was
unused.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2794 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 15:33:03 +00:00
Per Inge Mathisen
9caf914534
The convoluted targetting code in actionUpdateTransporter was actually never used.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2793 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 15:13:48 +00:00
Per Inge Mathisen
c49f899b13
Fix wrong weapon enumeration in new savegame format, leading to an assert. Sorry, guys!
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2792 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 00:12:29 +00:00
Per Inge Mathisen
dfac006aa5
Extend new savegame format to save game messages.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2791 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 23:26:19 +00:00
Per Inge Mathisen
ae9a987d92
Properly add structures and features to new savegame format.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2790 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 22:34:07 +00:00
Per Inge Mathisen
a204e399d3
Remove unused gfxScaling of features
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2789 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 22:13:58 +00:00
Per Inge Mathisen
feb9dbdce6
Factories do not have a formation, oddly enough! So remove it.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2788 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 21:20:15 +00:00
Per Inge Mathisen
c6316b31d2
Remove unused structure variables
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2787 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 20:42:49 +00:00
Per Inge Mathisen
6e163d9003
Extend new savegame code to save game objects. Droids saved fully, while structures
...
and features still have a way to go.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2786 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 20:28:28 +00:00
Per Inge Mathisen
f50b4d11dd
The old armour system had a single armour value for structures and features,
...
while droids had one armour value for each weapon class (there are only two
weapon classes now, though). The new armour system by Watermelon has for droids
one for droids one set of armour values, in which there is one armour value for
each weapon class, for each six side of the droid. This patch generalizes the
armour systems into one, and puts it into the base object definition
(BASE_OBJECT). This makes it easier to maintain, and is one step toward a more
advanced armour system for structures as well.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2785 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 19:27:08 +00:00
Giel van Schijndel
9f114081fb
* Update Doxygen comment for version_getFormattedVersionString (forgot to include this change in r2783)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2784 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 18:46:03 +00:00
Giel van Schijndel
bad236f4a9
* Make the <BUILD DATE> part of the formatted version string optional
...
* Don't include it when we're building from a tag
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2783 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 18:42:32 +00:00
Per Inge Mathisen
8b14087c3a
Remove multiweapon orders. Multiple weapons do not need separate orders.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2782 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 17:31:37 +00:00
Giel van Schijndel
45ea795b10
* Move sDelete into local scope (was only used in one function anyway)
...
* Move sTemp into a __more__ local scope
* Don't strip an extension from a string we aren't going to use anyway...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2781 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 16:21:26 +00:00
Per Inge Mathisen
caa5e02217
A droid never has more than one target stats type, so revert the addition of
...
multiple target stats for droids from r857.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2780 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 15:26:10 +00:00
Per Inge Mathisen
3b07b90160
New function objCount which counts the number of objects in the game.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2779 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 13:59:05 +00:00
Per Inge Mathisen
ff13be0b96
Do not disable lighting if it was never enabled in the first place, to avoid
...
doing unnecessary OpenGL state changes. Also make sure we turn off normalization.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2778 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 13:56:14 +00:00
Dennis Schridde
1dd2b54431
wzglobal.h never belonged to Eidos. Instead large parts of the code are copied from Qt and thus belong to Trolltech.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2776 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 13:25:02 +00:00
Dennis Schridde
5ccaa17971
Correct WZ_CC_TINYC check. (Note the namechange!)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2775 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 12:10:54 +00:00
Dennis Schridde
3a56a479b3
- Extend compiler detection with TinyCC
...
- Add window system detection
- Remove MSDOS from supported OSes
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2771 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-10 00:31:43 +00:00