Giel van Schijndel
cd8365fb01
Cleanup of widgRunScreen
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4194 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 14:21:53 +00:00
Giel van Schijndel
20448076bf
Revert part of r4184:
...
* Don't use abort() as it'll be triggered in non-debug builds as well, so stick with the ASSERT(FALSE, ...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4192 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 13:23:35 +00:00
Giel van Schijndel
d5e31eb751
Make sliderCreate return a pointer to its created slider and NULL on failure
...
Const correctness:
* make sliderCreate and widgAddSlider take its psInit pointers as const
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4185 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 11:47:23 +00:00
Giel van Schijndel
dd02289a5e
Clean up sliderCreate and widgAddSlider
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4184 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 11:47:19 +00:00
Per Inge Mathisen
fe2ff84ed3
Fix bug #11216 : When a tooltip is shown, the sky vanishes.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4164 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-20 14:59:33 +00:00
Roman C
3e615ea55f
Add a missing definition of a flex symbol.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4159 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-20 01:09:52 +00:00
Roman C
cfea441525
Aivolution AI:
...
-AI became more talkative
-more phrases can be recognized and used as commands
-cleanups
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4158 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-19 21:02:03 +00:00
Dennis Schridde
0c5ecc0efb
Fix bug #11277 : Strings containing non-ascii characters missing
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4118 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-17 07:23:48 +00:00
Christian Ohm
3dbd10b277
Add newlines to two files to shut up gcc.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4109 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 14:23:44 +00:00
Dennis Schridde
81f54bdbfd
We should add those files we #include...
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4108 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 12:56:45 +00:00
Dennis Schridde
2537bfc61c
Cleanup #includes a bit
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4107 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 12:39:08 +00:00
Per Inge Mathisen
1b9ef4f995
Remove hardcoded map visibility size from the ivis_opengl code.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4103 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 11:05:08 +00:00
Dennis Schridde
a3d8cdbdb2
New include order in frame.h. This should fix msvc problems hopefully.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4096 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 03:10:05 +00:00
Dennis Schridde
9e38b3c9f0
Port r4093 and r4094 from 2.1: Cleanup frame.c headers
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4095 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 02:46:03 +00:00
Giel van Schijndel
cc0c897d47
Add i18n.[ch] to the raw makefile system and the Code::Blocks projectfile
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4084 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-16 00:20:35 +00:00
Dennis Schridde
a80115b63e
Port r4075: Fix "array subscribt is above array bounds"
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4076 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 17:58:04 +00:00
Dennis Schridde
fe1a470ca1
Actually add the i18n.[ch] files...
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4073 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 17:53:10 +00:00
Dennis Schridde
a5643b359c
Move i18n stuff into i18n.[ch] and cleanup headers
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4068 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 17:36:50 +00:00
Dennis Schridde
9f5168e9dd
Some generic cleanup-style things
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4066 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 17:05:15 +00:00
Dennis Schridde
74bb1a185b
Revert r4061 (accidential commit)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4062 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 15:04:27 +00:00
Dennis Schridde
7e93a664b8
Move packaging -> pkg
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4061 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 14:57:35 +00:00
Dennis Schridde
e32e928c38
Remove missing ftol() and add some docs
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4055 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 11:40:35 +00:00
Dennis Schridde
0316bee001
Remove original backdrops (ugly) and wzlogo 3, 4 and rename the others to backdropX
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4046 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-14 19:31:42 +00:00
Dennis Schridde
cb2f0a30df
Patch MSVC Solution file to depend on SQLite and change eol-style to native for them, since otherwise patches will not apply.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4044 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-14 18:16:04 +00:00
Per Inge Mathisen
a71086a039
Prune dead code, and do not bother to dynamically allocate memory to save 12 bytes per polygon.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4037 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 20:46:29 +00:00
Per Inge Mathisen
d5687a6bce
Only set the colour for a model once, not once for every vertex. It does not vary.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4036 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 20:10:57 +00:00
Per Inge Mathisen
7693909947
Kill oddball type TERRAIN_VERTEXF (never used for terrain!) and reduce copying some more.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4035 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 20:03:50 +00:00
Per Inge Mathisen
3bcd4f7d1d
Kill PIEPOLY and reduce a lot of silly copying of variables back and forth for each polygon.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4033 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 19:44:57 +00:00
Per Inge Mathisen
a8f88483ac
Fix bug in OpenGL lighting mode which would mess up GUI. Also do not
...
recalculate the surface normal for every polygon for every frame! It
is already calculated when we load the PIE model, so let's use it.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4032 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 19:09:44 +00:00
Per Inge Mathisen
5f31a354f3
Do not enable and disable GL_LIGHTING for every polygon when lighting mode is enabled.
...
Reorganize the drawing code a bit to make it more obvious how the calls go.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4031 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 18:52:09 +00:00
Per Inge Mathisen
4b7f572ba4
Simplify pie_Polygon() since we never draw polygons of less than 3 vertices.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4030 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-13 18:32:45 +00:00
Per Inge Mathisen
f9d2a9152d
Remove PIE_ALPHA. Revert most of r4023, since some parts of the drawing code
...
did not handle alpha blending too well, and blended solids in some cases.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4025 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-12 21:07:26 +00:00
Per Inge Mathisen
169e5bcc42
Drastically reduce the number of (spurious) state changes per frame.
...
Doubles frames per second drawn here.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4024 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-12 20:14:25 +00:00
Per Inge Mathisen
d4e10b07e9
Do not care what blending state we are in when drawing simple and solid
...
graphics additions like lines and boxes to cut down on state changes.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4023 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-12 19:56:34 +00:00
Per Inge Mathisen
4004ce9872
Clean up in rendering modes. Remove unuseful pie_SetColourCombine().
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4022 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-12 19:41:33 +00:00
Per Inge Mathisen
83ddfb7b99
Small cleanup of the screen flip code
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4021 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-12 19:29:24 +00:00
Dennis Schridde
303895e5fb
Mark all BASE_OBJECT "derived" types as WZ_DECL_MAY_ALIAS (they may alias with any type).
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4011 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-11 15:53:45 +00:00
Giel van Schijndel
08e68d9c54
Don't initalise the 'file' pointer with itself
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4004 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 23:06:00 +00:00
Giel van Schijndel
dd0655b915
Make sure that xFullPathname uses SQLITE_OK as its return value for success (and SQLITE_IOERR for failure)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4003 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 23:05:38 +00:00
Giel van Schijndel
c4a62d5139
Rename sqlite3.diff to sqlite3.5.4.diff and update it to be a diff against r3997
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3999 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 17:00:31 +00:00
Giel van Schijndel
fa47b4ff72
Revert r3997 (we now have the original 3.5.4 in SVN history, at r3997)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3998 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 16:57:11 +00:00
Giel van Schijndel
9e7ba7bc22
Oops, r3994 still had some of our changes in it (r3992 to be precise), so this __is__ the clean 3.5.4 version
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3997 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 16:55:01 +00:00
Dennis Schridde
65dd2bce19
Update the diff to r3995 to log the base revision inside the file (svn diff -r3994 sqlite3.c > sqlite3.diff)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3996 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 14:46:46 +00:00
Giel van Schijndel
4e9e8e60d6
Revert r3994 (we now have the original 3.5.4 in SVN history, at r3994)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3995 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 13:52:21 +00:00
Giel van Schijndel
64dd1a52c5
Revert to SQLite before all modifications (i.e. this is the amalgamation of 3.5.4)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3994 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 13:49:58 +00:00
Dennis Schridde
f0ab52dbd3
Fix some missing initialisers
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3992 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 11:42:18 +00:00
Dennis Schridde
d7bb157c7b
Strip -Werror from WZ_CFLAGS for sqlite3, since there are far more warnings...
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3991 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 11:10:35 +00:00
Giel van Schijndel
33216b2e9d
Move all stuff that actually belongs in CPPFLAGS (but is called CFLAGS) to AM_CPPFLAGS
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3988 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 10:50:58 +00:00
Giel van Schijndel
037471b784
Update sqlite3.diff for r3984
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3987 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 10:15:45 +00:00
Dennis Schridde
d8409c9819
- Don't define CFLAGS anymore, export WZ_CFLAGS instead, which can be overridden by make commandlines
...
- Set -DYY_NO_INPUT only in those places where needed
- Add some previously forgotten CFLAGS where needed
- Remove extranous -lintl from WIN32_LIBS
- Remove apparently unnecessary directory from Mac include (png_util doesn't need it either)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3986 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 02:01:46 +00:00