Commit Graph

57 Commits (9b94b011bb4d2da13881bcd0644922ae0f41c157)

Author SHA1 Message Date
Giel van Schijndel 150f0ed209 #include fixes
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4266 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 19:08:49 +00:00
Gerard Krol 0b07130da8 Fix bug #11121, "Briefings not displayed at high resolutions".
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3855 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-22 20:34:03 +00:00
Gerard Krol 2685185c33 Make sure that long lines of text are correctly drawn and wrapped for the intelligence display.
This also works for larger fonts. This fixes bug #10913, and makes patch #965 obsolete.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3712 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-07 19:19:15 +00:00
Per Inge Mathisen 3a6bfab317 Fix more problems with tabs in the GUI, patch #949 by Buginator.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3543 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-22 20:11:10 +00:00
Per Inge Mathisen 921ab82191 Clean up GUI frame drawing and port it to PIELIGHT.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3528 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-21 16:57:00 +00:00
Per Inge Mathisen 08c2a06822 GUI cleanup
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3497 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-16 18:54:16 +00:00
Giel van Schijndel 3d245df0f9 * Provide an implementation of sound_PlayStream
* Modify audio_PlayStream's prototype to match sound_PlayStream's implementation & prototype
 * In cdspan_PlayInGameAudio use sasprintf instead of a statically sized array and snprintf
 * Add some Doxygen comments

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3276 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-31 15:16:59 +00:00
Giel van Schijndel b0909d4c18 * Get rid of some unnecessary global variables (aAudioName, aTextName, aSubtitleName) since stack allocated variables sufficed
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3203 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 23:03:09 +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 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 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
Dennis Schridde 1d3ed30822 More UI ptr<->int fixes. !!WIP!!
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2763 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-09 21:01:23 +00:00
Dennis Schridde cd586193d3 - Use UserData instead of pUserData to store non-pointer data in GUI system.
- Replace several occurances of (void*)0 with NULL.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2762 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-09 20:07:12 +00:00
Stefan Huehner 3b3199b7f9 remove the text.h include from a lot of files
which dont need its declarations


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2691 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 17:49:53 +00:00
Per Inge Mathisen b5e7d1149d Fix crash upon entering cam2 mission1. This fixes bug #9545.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2643 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 18:13:50 +00:00
Giel van Schijndel d075832459 * Add font rendering and UTF-8 support through usage of QuesoGLC (an OpenGLC implementation);
* This _will_ require you to install http://quesoglc.sourceforge.net/ on your system to be able to compile (windows binaries are provided on the sourceforge download page as well; just dump them in wz's devpackage directory for now)
 * Currently the font render code is hard-coded to select two fonts: DejaVu Sans Mono regular style (aka "Book") or bold style; if you're package manager doesn't provide these fonts (Debian and derivatives have "ttf-dejavu"), you can get them from http://dejavu.sourceforge.net/

This closes #1 (https://trac.mortis.eu/warzone/ticket/1 I dumped/maintained my patch there)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2521 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-01 19:45:49 +00:00
Giel van Schijndel e559915d83 * Change an assert(FALSE) into a more descriptively styled: !"text string"
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2382 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-16 09:49:44 +00:00
Giel van Schijndel fc8ab2c14e * Remove CursorSnap code; it was this code that was responsible for "snapping" the mouse cursor when switching menus
* This removes csnap.[ch] (removed from automake/autoconf, Code::Blocks, MSVC)
Patch #789 by Ken Rushia (with some minor additions & changes by me)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2344 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-05 11:42:59 +00:00
Per Inge Mathisen 33e7c70cc4 Cleanup. Remove another ton of unused code. Fix error message which is not an error.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2339 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-03 17:39:04 +00:00
Per Inge Mathisen ace17002a8 Misc cleanups from ref count work
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2056 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-12 15:22:16 +00:00
Dennis Schridde 3f2786c030 - More cleanup
- Teach for to pieblitfunc
- sed DrawTransImage to DrawImage (they were defined this way before anyway) and remove an unnecessary parameter


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1875 4a71c877-e1ca-e34f-864e-861f7616d084
2007-06-18 14:25:06 +00:00
Gerard Krol 6671fa934e 1. Removed the terrible memory leaks from the resource system. 2. Fixed the memory leaks for the terrain tiles. 3. Fixed a lot of uninitialised
variables. 4. Commented out some unused sound code.
I just love Valgrind :)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1390 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-07 13:23:14 +00:00
Gerard Krol b8c4065e15 1. Fix an assert when winning or losing a skirmish game. 2. Remove some debug messages 3. Now display the mission result screen on the end of a
skirmish/multiplayer game.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1359 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-04 11:17:48 +00:00
Giel van Schijndel 26f2672bfd * remove macro PTRVALID
* replace all instances of PTRVALID(ptr,size) by (ptr != NULL)
 * remove asserts of style ASSERT( x == NULL || x != NULL ) because they would evaluate to true always anyhow and as such wouldn't ever trigger
 * remove macros iV_HeapAlloc and iV_HeapFree and replaced them with MALLOC and FREE respectively (that's what they expanded to anyway)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1348 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-03 13:20:41 +00:00
Per Inge Mathisen c232641119 Copy strings back into the C code, and make them translatable by gettext.
Thanks to Huehner for writing the script that transformed calls to strres
back into C strings.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1325 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-01 20:15:46 +00:00
Gerard Krol aec9db0a8f Updated the CPU hungry radar only once in 10 frames, instead of twice per frame. Replaced a call to iV_PaletteNearestColour(255, 255, 255) with
PIE_TEXT_WHITE.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1249 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-16 18:26:29 +00:00
Giel van Schijndel 35de2b63f1 * get rid of lib/ivis_common/geo.h (only had one line, which effectively made it a symlink to another include file)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1110 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-14 20:13:31 +00:00
Roman C f4c4c48dd2 Patch by Gerard Krol:
replaces AND/OR macros with &&/||

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1089 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-10 16:39:39 +00:00
Giel van Schijndel 4def8b89ba Fix some compiler warnings:
* remove some unused functions

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1049 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-29 22:17:40 +00:00
Dennis Schridde 952e060a60 Bring r1035 to trunk + reorder frontend images in .wrf
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1037 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-26 15:04:58 +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
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
Dennis Schridde bf9d1d0fd1 Fix last commits and remove another bunch of warnings.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@886 4a71c877-e1ca-e34f-864e-861f7616d084
2006-12-02 14:38:09 +00:00
Dennis Schridde 4f837c0c70 Patches by Christian Ohm:
034 - Reorganized src-warcam.c
036 - Cleanup includes and function declarations


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@884 4a71c877-e1ca-e34f-864e-861f7616d084
2006-12-02 12:50:28 +00:00
Dennis Schridde 526cd5482f Patches by Christian Ohm:
013 - Cleanup environ.c-h
015 - Remove some unused code from frame.c-h
017 - Remove unused function ScanFilename()
023 - Fix more warnings, remove unnecessary functions


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@865 4a71c877-e1ca-e34f-864e-861f7616d084
2006-11-26 11:58:01 +00:00
Dennis Schridde 141a421d04 Patches by Christian Ohm:
002 - PSX removal part 2
019 - Remove PSX conditionals
020 - Remove IsPSX variable
021 - Remove unused parameter PSXSeqNumber from seq_AddSeqToList and seq_AddTextForVideo


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@861 4a71c877-e1ca-e34f-864e-861f7616d084
2006-11-26 11:20:44 +00:00
Dennis Schridde fb74a1f8dc Patch by Thomas Rast: Include string.h against warnings
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@821 4a71c877-e1ca-e34f-864e-861f7616d084
2006-11-06 14:40:07 +00:00
Dennis Schridde d3cd44148d Patch by Gerard Krol: Replace STRING with char (STRING was confusingly defined to char)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@804 4a71c877-e1ca-e34f-864e-861f7616d084
2006-11-03 21:35:50 +00:00
Roman C 2f2015340c -added script callback to process key inputs from within scripts
-added in-game debug window (mostly for scripting debugging purposes, something like a watch window)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@799 4a71c877-e1ca-e34f-864e-861f7616d084
2006-11-01 13:56:23 +00:00
Dennis Schridde 4ea12897a5 - Replaced all filenames (I could find) with their lowercase and platform independed notation. There might be some uppercase filenames left in the sourcecode.
- Because savegame filenames are converted to lowercase old savegames won't work anymore. You can simply fix that by renaming them to lowercase.
- All unix_path, unix_fopen and PHYSFSEXT_locateCorectCase functions and calls to them have been removed. (So you _will_ notice when a file is not found, at least on Unix systems.)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@776 4a71c877-e1ca-e34f-864e-861f7616d084
2006-10-07 14:13:47 +00:00
Roman C 7f143b5a48 New script callbacks are called delayed now, since there was a problem when forming alliance.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@775 4a71c877-e1ca-e34f-864e-861f7616d084
2006-10-04 02:54:24 +00:00
Dennis Schridde 3261a09baf BIG cleanup of headers.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@749 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-23 17:24:55 +00:00
Roman C 96f59fbb50 Fix to #6735 and #6751,
also fixes some beacon-related code

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@687 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-06 16:58:20 +00:00
Dennis Schridde 4208601a38 - Fix string stack reset for scripts
- Clean warnings and a wrapper function for widgets
- Add an assert to intDisplayMessageButton to catch crashes better


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@631 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-25 20:38:27 +00:00
Dennis Schridde 0e288f45e7 - Replace all ASSERT(( )) with ASSERT( )
- Simplify definition of ASSERT(). Now is the same for GCC and MSVC.
  This may not work on versions older than MSVC 2005. If you experience this, please report it!

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@613 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-23 12:58:48 +00:00
Dennis Schridde 62ae49b0ce Replaced all occurences of DBMB, DBPRINTF and DBERROR with their former define.
( DBPRINTF(("Message")); becomes debug( LOG_NEVER, "Message" ); )



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@608 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-22 14:28:49 +00:00
Per Inge Mathisen 90da3e40c8 Comment out an ASSERT which triggers when the 'Fast Play' tutorial is run.
I think this tutorial is calling the wrong message function here, so this
is probably just a workaround. In any case, it is called to display video
we no longer have.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@527 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-05 12:17:58 +00:00
Per Inge Mathisen 4cc429e687 Fix assertion warning and erronous variable assignment inside an ASSERT()
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@526 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-04 20:03:26 +00:00
Per Inge Mathisen ade47a9c36 Remove some now unused code used previously by software renderer only.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@501 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-23 11:31:51 +00:00
Per Inge Mathisen 549c97d926 Remove even more pie_hardware() related stuff
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@499 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-23 11:09:10 +00:00