6bfe7bfa86
* Fix segfault caused by using the wrong destruction function
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1502 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-18 21:25:32 +00:00
68eaeab5f3
* if we malloc we should free!
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1501 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-18 20:06:35 +00:00
108e9ec935
Cleanup
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1500 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-18 18:17:21 +00:00
d844dbab9c
* Fix a segfault caused by dereferencing a NULL pointer when a resource has not been found
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1499 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-18 18:02:11 +00:00
fa6252d5ec
Xcode project now properly excludes unnecessary files from game data
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1498 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-18 16:16:49 +00:00
c79ff3b3c4
Fix to #include order in r1496
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1497 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-18 14:46:38 +00:00
f6da22d739
_MACOSX_ -> WZ_OS_MAC
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1496 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-18 12:40:50 +00:00
39f8131d38
Added missing property list file
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1495 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-18 03:14:35 +00:00
314f371805
Small documentation fix on MacOS xcodebuild command
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1494 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-18 03:13:05 +00:00
af531c7ccb
Re-added MacOS build readme file
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1493 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-18 03:11:41 +00:00
91535c6596
Converted MacOS port to use Xcode to produce a universal binary. Warzone
...
will henceforth require MacOS 10.4 "Tiger" to run.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1492 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-18 03:10:53 +00:00
c1917ef076
+ updated Danish language translation to mirror recent additions
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1491 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-17 21:11:08 +00:00
aa9a519794
* Remove support for decoding (and encoding in case of screenshot dump code) of JPEG pictures
...
* Remove some dead (commented out) & dirty code from multiint.c which used JPEG code (image_load_from_jpg)
* Remove dead (commented out) code from screen.c which used JPEG code (function static GLuint image_create_texture)
* Remove unused backdrop types from pieblitfunc.[ch]
* Convert last JPEG files into PNG, add a "comment" property on those: "All of these are converted from JPEG files, so this is JPEG quality."
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1490 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-17 18:24:31 +00:00
5756890d20
* Remove inclusion of <setjmp.h> which apparently libpng wants to include first (in <png.h>)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1489 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-17 17:48:19 +00:00
baa3dcbb2a
* Add PNG screenshot dumping code, when pressing F10 (with a default keymap) both a JPEG and PNG screendump will now be output
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1488 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-17 16:53:28 +00:00
761fd8bfb2
MSVC makes a difference between headers and sources...
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1487 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-17 16:33:19 +00:00
fd3324a9fe
* pcx.c: use size_t for memory buffer length (size_t is the appropiate type for this, unsigned int is not)
...
* change macro BUFFER_SIZE to static const JPEG_bufferSize (compiler will optimize this away)
* char* -> unsigned char*
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1486 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-17 12:58:22 +00:00
c3683f64dd
* make PNGheader be explicitly unsigned (required for compilers that define 'char' as being signed)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1485 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-17 12:23:54 +00:00
cbf89c88d8
* provide updated MSVC project (thanks to "Purple Monkey" for that: http://wz2100.net/forum/index.php?topic=597.msg4921#msg4921 )
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1484 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-16 23:39:38 +00:00
f49c5cbdd5
* change pie_PNGLoadMem to pie_PNGLoadFile which (as the name suggests) now loads textures directly from PNG files (rather than memory buffers)
...
* change pie_ReloadTexPage to use files instead of memory buffers as well
* change data.c's resource handler mappings to now load some more fileformats directly from file (all that directly or indirectly used to depend upon pie_PNGLoadMem)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1483 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-16 22:29:44 +00:00
7356aa1b9a
* make pie_PNGLoadMem play nice and take the buffer size as an argument rather than assuming it to be 10000000 (10 million)
...
* do the same with pie_ReloadTexPage which calls pie_PNGLoadMem
* char* -> const char* in tex.c
* fix a syntax error from r1481
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1482 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-16 20:07:56 +00:00
dcf4cb3263
* turn `integer overflow` debug message into an assert
...
* dump less information in the debug log if the assert is triggered (just "integer overflow; no more filenumbers available.")
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1481 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-16 20:00:12 +00:00
7527047316
* char* -> const char*
...
* make screen dumping code (screen shotstuff) more readable and friendly to edit (behaviour should be unchanged)
* change screenDumpToDisk:
* now returns void (rather than the target file name of the screen shot) since its only callee (a keymap callback) ignored the return value
* use snprintf now instead of sprintf (to prevent buffer overflows)
* add code to detect integer overflows (maybe we should just abort() on this condition?)
* remove an empty and commented out function (screenTextOut)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1480 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-16 19:22:01 +00:00
345581c9ac
Fix a bug introduced in r1469, which produced gaps where the buildings should be and made the terrain jump around. (display3d.c)
...
Additionaly:
- Cleanup indention
- Remove an unused, commented out function
- Make code a bit more readable
- Insert suggestion into display3d.h (playerXTiles and rx are only use in one otehr file each, so maybe we could wrap them into a function for the purpose of encapsulation. The comment is ugly, I know.)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1479 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-16 19:09:09 +00:00
300f691b0b
* Fix error from last commit where the wrong pointer was used
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1478 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-16 17:49:15 +00:00
09b08c1582
* remove senseless use of malloc (we now statically allocate on the stack)
...
* remove goto, placed the "goto"-code in an inline function instead
* make pie_PNGLoadMem const correct (i.e. take a buffer we don't write to as const char*)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1477 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-16 17:34:11 +00:00
ba31124ecd
Minor german translation update: ~60%
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1476 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-16 14:56:01 +00:00
3c407e0972
* some const correctness (char* -> const char*)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1475 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-16 14:53:09 +00:00
ae88cdbf7d
* Apply patch #691 (fixes typos in names.txt and cam2strings.txt)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1474 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-16 14:06:03 +00:00
1f405057ff
* Fix incorrect po-file for Dutch translation
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1473 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-16 13:46:33 +00:00
51347f365c
* remove MP3 decoding support
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1472 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-16 13:44:41 +00:00
1d160dbfe0
* remove now unused functions for working with hashnames on audio tracks
...
* `make -C po update-po`
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1471 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-15 22:46:57 +00:00
936205a9ee
* Fix bug #8938 (introduced in r1251) which occurred due to saving/loading functions of ST_SOUND being dissymmetric (save function stored the fileName, load function interpreted it as a UDWORD hash)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1470 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-15 22:36:54 +00:00
5f87829d26
Clean indention and make the code a little bit more readable.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1469 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-15 20:45:09 +00:00
a9f120adec
Add missing includes to quelch warnings.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1467 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-15 18:48:13 +00:00
237e809d21
* Fixed a segfault in the the code producing "research completeded"-messages (caused by wrongly assuming we wouldn't be fed a NULL pointer)
...
* Move that code out of the if-statement since the if-branch of that piece was exactly the same as the else-branch
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1466 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-15 18:21:06 +00:00
f8c164fdde
* Fix inconsistent newlines and set svn:eol-style to native in lib/ and src/
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1465 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-15 14:15:31 +00:00
e861775906
* fix by charon for segfault caused by not setting (non-static global) pointer to NULL after freeing it
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1464 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-15 13:28:24 +00:00
9beab09917
* change some abuses of pointer-arithmatic (or pointer-magic in this case really) into array indexing
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1463 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-15 12:49:29 +00:00
585db5249e
Simplify code, especially the prepending of the debug part.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1462 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-15 12:46:08 +00:00
53d9cc48e4
Sorry for the magic number in the last commit...
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1461 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-15 12:12:52 +00:00
d3408cec7b
- Remove mem.h and references
...
- Fix possible illegal writes for research messages
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1460 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-15 12:01:36 +00:00
ce16856887
FREE->free, MALLOC->malloc (sed+review)
...
This patch will create crashes where the code expects FREE to set the pointer to NULL! (Those problems should be fixed anyway.)
The only occassion where I saw this is when quiting a game, so it is not too much of an issue.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1459 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-15 10:43:05 +00:00
2707ce0fd6
Passed wrong pointer...
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1458 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-15 10:35:23 +00:00
91cf893778
Show name of the finished research in the console.
...
Original patch by Watermelon (slightly modified).
Based on an idea by TheNoid and Kreuvf.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1457 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-14 21:57:52 +00:00
68da5a9613
Make some more char* -> const char*
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1456 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-13 15:18:49 +00:00
34fd2afd1f
Make some more char* -> const char*
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1455 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-13 15:11:03 +00:00
a7119c1600
* change the direction of the AI player enabled check so that it will enable the bottom one if it is disabled (looks better)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1453 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-13 15:05:43 +00:00
c0a44c70e2
Make some more char* -> const char*
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1452 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-13 15:04:08 +00:00
216eb52e3c
* Fix bug #8759 (in Skirmish mode it was possible to disable all AI players, we now check for that and make sure that at least one AI player is always available in Skirmish)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1451 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-13 14:48:23 +00:00
Giel van Schijndel
Ari Johnson
Dennis Schridde
Christian Vest Hansen
Per Inge Mathisen
Stefan Huehner