Dennis Schridde
31a863a90b
Setup eol-style CRLF for vcproj files
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3473 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-14 20:49:48 +00:00
Dennis Schridde
d7bbab46af
Set eol-style and mime-type for vcproj files
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3471 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-14 19:55:59 +00:00
Per Inge Mathisen
49cc91b0ef
Move all skybox page handling to display3d.c to prepare for skybox scriptability.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3438 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-12 15:10:02 +00:00
Per Inge Mathisen
441f4038e4
Replace a ton of custom texture clipping code with a single call to OpenGL scissor test.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3380 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-06 14:05:13 +00:00
Giel van Schijndel
a2fe74852b
* Fix some errors in the Doxygen documentation
...
* Parameter descriptions for non-existing parameters removed
* Wrong parameter names renamed/fixed
* Syntax errors in passing the a parameter to a Doxygen command at the wrong location
* Prevent HTML interpretation of some comments
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3373 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-05 23:42:54 +00:00
Per Inge Mathisen
168a66b89c
Add another backdrop by cathuria.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3303 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-01 21:40:04 +00:00
Per Inge Mathisen
a4972d3d38
Reduce verbosity of LOG_3D
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3273 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-31 14:04:21 +00:00
Per Inge Mathisen
877ac6456c
Add lots of doxygenized comments.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3230 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-29 22:34:41 +00:00
Ari Johnson
47816967a7
Updated Xcode project and some endian fixes; also changed endian_*() calls
...
to expand to ((void) (x)) on little-endian systems, so that the compiler
will catch little-endian developers who forget to update the endian_*()
calls when they change the names of structure fields.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3205 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 23:55:34 +00:00
Per Inge Mathisen
fae5745233
Remove unused function pie_DrawImageFileID. Rename pie_SetColourKeyedBlack to
...
pie_SetAlphaTest, and do not enable it while drawing the ordinary terrain.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3189 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 01:05:37 +00:00
Per Inge Mathisen
53aa930d6e
Turn IMD min and max dimensions into vectors.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3111 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-21 17:34:23 +00:00
Ari Johnson
31fc86ee9f
Moved a space to match formatting
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3085 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-17 17:22:07 +00:00
Giel van Schijndel
f1f1a19be4
* Fix a bug in iV_DrawTextRotatedFv where I used sprintf instead of vsprintf
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3076 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-16 16:02:54 +00:00
Giel van Schijndel
88bf925cb8
* Add functions iV_DrawTextRotatedFv, iV_DrawTextRotatedF, iV_DrawTextFv and iV_DrawTextF to draw text with a printf-like syntax to the screen
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3075 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-16 15:47:55 +00:00
Ari Johnson
0a9bcf08a3
Xcode project can almost build trunk again. This commit allows the project
...
to download and build the external libraries that Warzone has added since
the last time that trunk would build under Xcode. The actual game currently
will not build due to other issues, but this is phase 1.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3068 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-15 23:34:51 +00:00
Per Inge Mathisen
e0c450b415
Remove excess display related code.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3062 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-15 12:18:56 +00:00
Per Inge Mathisen
5417afae46
Read tile colour information directly from mapTiles, instead of going through tileScreenInfo
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3057 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-15 11:08:23 +00:00
Giel van Schijndel
c51bd8ae10
* Get rid of a large quantity of unused parameters
...
* Turn some signed integers ("int" or "SDWORD") into unsigned integers where it made more sence (and signed integers caused warnings about comparing signed with unsigned integers)
* At some places cast to an unsigned integer (where the type of the expression is a signed integer but the result of it logically _always_ is an absolute value)
* Remove unused struct-type EVENT_INIT
* Convert use of malloc->memcpy->free to one single realloc call (and now make sure to actually check realloc's return value, which wasn't done with the malloc call)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3037 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-10 23:15:46 +00:00
Per Inge Mathisen
6c4c61fbb7
PIELIGHT fix for map hightlight. Remove use of colours to communicate a boolean value.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3022 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 21:50:47 +00:00
Dennis Schridde
c64b565f14
Patch #872 by Buginator. Untested by me since in Bugs we trust. ;)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3020 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 19:10:34 +00:00
Per Inge Mathisen
53f11c391f
Add a new vector field to the PIELIGHT union, and send colours to OpenGL
...
as arrays rather than as individual bytes.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3019 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 17:41:00 +00:00
Per Inge Mathisen
4ee90ba9e3
Adapt radar view to PIELIGHT scheme. The radar colours have been changed a lot, and
...
we probably need to massage these colours a bit before release. Radar tile colours
in all but objects only mode are a complicated blend of tile height and colour. Closes
patch #858 .
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3018 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 17:23:34 +00:00
Per Inge Mathisen
4ddd4c28af
Large PIELIGHT cleanup. Please report bad colours.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3017 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 16:09:23 +00:00
Per Inge Mathisen
63211571b0
New utility function pal_Colour() creates PIELIGHT from RGB values.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3011 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 13:11:09 +00:00
Per Inge Mathisen
76840b01d2
Large PIELIGHT cleanup. Also cleans up tile drawing logic somewhat.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3006 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-09 00:33:03 +00:00
Giel van Schijndel
ec392ef7d4
* Improve the quality of the QuesoGLC error messages produced when fonts cannot be loaded/selected
...
* When we're unable to select a font face give a warning (LOG_WARNING) instead of an error (LOG_ERROR)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2992 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-07 19:31:19 +00:00
Freddie Witherden
299d7bfcfb
Commit patch #871
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2983 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-05 21:56:12 +00:00
Per Inge Mathisen
8d48c5fdd1
Partial conversion from 0.0->1.0 texture coordinate range. For now only terrain
...
textures are converted. Once they are done, the texture matrix hack is restored.
Thanks to devurandom and cybersphinx for help and previous efforts in this area.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2980 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-05 18:54:17 +00:00
Per Inge Mathisen
4519230af1
Split out CLIP_VERTEX from TERRAIN_VERTEX, since the former usages are not really
...
related to terrain, and do not need all terrain fields and future changes.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2979 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-04 20:25:25 +00:00
Per Inge Mathisen
f86858109a
Fix texture size warning. It will correctly nag about missing support for 2048x2048 textures.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2973 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-03 20:29:34 +00:00
Per Inge Mathisen
6da463546f
More PIELIGHT fixes
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2961 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-02 16:38:21 +00:00
Per Inge Mathisen
4bbf490aca
Change the rendering of the normal terrain to use vertex arrays. We still
...
recalculate everything each turn. See patch #865 .
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2939 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 17:07:03 +00:00
Per Inge Mathisen
afa23e157a
Beauty fixes
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2937 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 16:55:23 +00:00
Dennis Schridde
d75b63cdb3
Cleanup water-moving:
...
- Remove now unnecessary offset parameter from pie_DrawTerrainTriangle
- Move GL code from display3d.c to piematrix.c
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2935 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 16:43:28 +00:00
Giel van Schijndel
263f92f24f
* Always clear the colour buffer in pie_ScreenFlip; this should prevent "screen smearing"; hinted by Buginator
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2901 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-28 21:53:59 +00:00
Per Inge Mathisen
134e31b558
More PIELIGHT fixes. Retire iV_BoxFill. Fix "mission achieved" dialog colours.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2895 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-26 22:59:21 +00:00
Per Inge Mathisen
4dd2dfc63d
More PIELIGHT conversions. Fix colour issue in load/save dialog.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2894 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-26 22:10:31 +00:00
Per Inge Mathisen
13d1607349
Introduce new palette system WZCOL_* for setting the essential game palette.
...
Change over pie_BoxFill() to PIELIGHT. Fix colour bug when building structures.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2893 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-26 21:48:36 +00:00
Per Inge Mathisen
af40ffa1cb
Convert fog code to PIELIGHT
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2888 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-25 23:06:24 +00:00
Per Inge Mathisen
fcf0fc8d21
More colour cleanup.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2886 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-25 22:38:22 +00:00
Per Inge Mathisen
7713623a64
Remove unused bilinear mode.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2883 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-25 21:47:57 +00:00
Giel van Schijndel
6172bdd498
* Refactor space trailing code in textdraw.c such that it is easier to read (also has some comments now which might help...)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2882 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-25 21:43:16 +00:00
Per Inge Mathisen
4e25b2d0fe
Make more use of PIELIGHT.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2880 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-25 21:15:08 +00:00
Per Inge Mathisen
b5fa689b41
Include SDL_opengl.h instead of GL/gl.h for better portability. This is vital
...
for Mac compilation.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2864 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-24 16:41:00 +00:00
Dennis Schridde
9cc0a628c1
Do parts of the proposed changes in "[Warzone-dev] build issues in FreeBSD system" by Yaroslav Kolomiyets from 24.10.2006:
...
- SDL header includes don't use SDL/ anymore (raw Makefiles and MSVC Project adapted).
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2863 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-24 11:49:51 +00:00
Per Inge Mathisen
36c3cb1b6c
Remove unused PIEVERTLIGHT. Retire iColour type in favour of PIELIGHT. Fix circular headers.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2861 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-23 21:51:48 +00:00
Per Inge Mathisen
904bfe5f3d
Make some stuff static
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2842 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-20 20:41:13 +00:00
Per Inge Mathisen
345d335790
Reduce max radar zoom to 1, because a value of 2 is buggy. Replace
...
hard-coded radar size values with a slightly better define.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2841 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-19 21:32:35 +00:00
Per Inge Mathisen
d8c8ee9ee1
Remove unused _iVPRIM_DIVTABLE table.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2838 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-19 20:09:01 +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