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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
223bc803e8
Use OLD_TEXTURE_SIZE_FIX instead of 256.0f to scale texcoords, to make clear that this is a fix for the old ...
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2759 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-09 17:43:50 +00:00
e624663f40
Now that we draw water in a separate pass, we can reduce the number of state changes a lot.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2704 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-04 13:26:04 +00:00
01e24bf6ed
Clean up pieblitfunc. Dump dead code.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2702 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 22:48:46 +00:00
6e19e51118
Replace int x,y,z in TERRAIN_VERTEX with a Vector2i, and fix two cases of
...
type punned pointer casts.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2670 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 22:00:55 +00:00
b99feff92f
Merge PIEVERTEX and SVMESH into TERRAIN_VERTEX and use struct assignment instead of memcpy on it.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2668 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 21:41:38 +00:00
70718282a4
Fix shadows looking bad from opposite view direction of shadows, and fix
...
memory leak in shadow code reported in bug #10190 .
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2659 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 18:52:43 +00:00
49df8ea371
Use GLC_TEXTURE for font rendering. Patch by Bertrand Coconnier in bug #10188 .
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2646 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 19:20:25 +00:00
e808d83f0c
Add comment about quesoglc workaround being fixed upstream as of today.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2645 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 19:00:55 +00:00
1d2caebccd
Cleanup fugly code, and add nasty hack around weird bug. See bug #9843 for more info on bug.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2644 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 18:16:15 +00:00
f5602b4778
* Replace a large amount of strncpy() calls with the safer strlcpy()
...
* Fix an error in src/game.c where we would use the wrong size as parameter to strlcpy()
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2640 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 16:18:52 +00:00
bd37e62cb2
* Replace a lot of strncat(dst, src, sizeof(dst) - strlen(dst) - 1) calls with the less bloated strlcat(dst, src, sizeof(dst)) form
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2637 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 15:47:17 +00:00
Ari Johnson
Per Inge Mathisen
Giel van Schijndel
Dennis Schridde
Freddie Witherden