Commit Graph

1506 Commits (2063d578c3c1c3e28c50497fd3297dc9f1103215)

Author SHA1 Message Date
Dennis Schridde 80e69b6c02 Removed nasty "goto init", which was never used anyway. (reInit was always FALSE.)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1598 4a71c877-e1ca-e34f-864e-861f7616d084
2007-05-07 19:31:44 +00:00
Dennis Schridde a46b8492e8 "Video_mode no longer valid", thus removed.
Turned gamemode #defines into an enum.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1597 4a71c877-e1ca-e34f-864e-861f7616d084
2007-05-07 19:27:45 +00:00
Dennis Schridde a8d55255c2 Clarify the cheat mode message.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1596 4a71c877-e1ca-e34f-864e-861f7616d084
2007-05-07 18:58:26 +00:00
Per Inge Mathisen b7e9c15c93 Some residual cleanup, including fixing an erronous static
assignment in the sound code.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1595 4a71c877-e1ca-e34f-864e-861f7616d084
2007-05-06 20:20:45 +00:00
Giel van Schijndel 58f873acf4 * Check source pointer for a value of NULL rather than another pointer (in the save droid) which we don't use (should cause no difference in execution due to the above memcpy call)
Thanks to Hylke/The_Noid for reporting this.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1594 4a71c877-e1ca-e34f-864e-861f7616d084
2007-05-06 18:06:51 +00:00
Dennis Schridde 52349eb6cc Another try to workaround systems which usualy disable their POSIX extensions. AC_USE_SYSTEM_EXTENSIONS might have worked as well, but is not present before AC 2.61.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1593 4a71c877-e1ca-e34f-864e-861f7616d084
2007-05-06 17:51:04 +00:00
Dennis Schridde d6add14f37 Workaround broken MacOSX POSIX headers
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1592 4a71c877-e1ca-e34f-864e-861f7616d084
2007-05-06 16:53:53 +00:00
Dennis Schridde 7ee7276d89 Hacky fix for wrong POSIX checks. Now all non-Windows systems are treated as POSIX systems and required to support the Single UNIX specs Version 2.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1591 4a71c877-e1ca-e34f-864e-861f7616d084
2007-05-06 16:26:09 +00:00
Roman C 90008ff9a6 - fix a bug preventing skirmish AI from researching (only affects non-vtol research branch)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1590 4a71c877-e1ca-e34f-864e-861f7616d084
2007-05-06 13:46:24 +00:00
Roman C 600e947bab - added two additional chat commands which can be recognized by AI
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1589 4a71c877-e1ca-e34f-864e-861f7616d084
2007-05-06 12:03:18 +00:00
Roman C 846669c8c1 Skirmish/multiplayer AI update:
- alternative VTOL technology branch: on larger maps AI will sometimes use VTOLs for attacking  instead of land units
- AI will rebuild destroyed walls
- AI won't use all the trucks to build a single structure anymore
- faster structure upgrades
- more effective truck production when low on trucks
- faster cyborg production
- AI now builds cyborg mechanics
- AI is even faster on startup
- AI will use more cyborgs for for defending

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1588 4a71c877-e1ca-e34f-864e-861f7616d084
2007-05-05 16:01:34 +00:00
Roman C 3776835a01 - added additional multi-weapon templates for multiplayer/skirmish games
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1587 4a71c877-e1ca-e34f-864e-861f7616d084
2007-05-05 15:45:39 +00:00
Roman C cd13ad64a8 - when trying to build on a certain location AI will now first consider location passed from scripts and only then it will check tiles nearby
- implemented pickStructLocationB() scripting function to find a suitable location with a desired number of blocked neighboring tiles nearby

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1586 4a71c877-e1ca-e34f-864e-861f7616d084
2007-05-05 15:38:04 +00:00
Roman C 8fb6fd5b3c - increase number of allowed script instruction until the interpreter recognizes an infinite loop
- increase total number of scripts object variables to handle larger AI scripts

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1585 4a71c877-e1ca-e34f-864e-861f7616d084
2007-05-05 15:28:21 +00:00
Roman C 9bd29a1511 -cyborg propulsion must be enabled on startup of multiplayer/smirmish games
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1584 4a71c877-e1ca-e34f-864e-861f7616d084
2007-05-04 16:43:15 +00:00
Dennis Schridde 362343969c We dont depend on zlib...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1583 4a71c877-e1ca-e34f-864e-861f7616d084
2007-05-02 16:13:20 +00:00
Dennis Schridde 1587bc93c1 - Formating and removal of unused lines
- Removed a 20ms delay from the mainloop
- Added ASSERT_STATIC macro to check assumptions on compiletime


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1582 4a71c877-e1ca-e34f-864e-861f7616d084
2007-05-02 15:50:30 +00:00
Gerard Krol 2055a59020 Fix "ghost" games, and allow for updating the game state when hosting a game without having to disconnect and reconnect.
This will have to be implemented in the game as well.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1581 4a71c877-e1ca-e34f-864e-861f7616d084
2007-05-01 21:01:32 +00:00
Dennis Schridde 351060f21f - 1st attempt to create an API for image loading (support for PNG features like non 8bit channels still needs to be thought of). Appropriate code location is also missing (added new functions to tex.c, since they were not PNG related)
- Renamed pie_PNGLoadFile, because I got confused about pie_ vs. iV_ when working on my terrain stuff, and did not fix it when backporting to trunk
- iTexture (now aka iV_Image, s.a.) is given a depth field to enable support for different number of channels. This is required to support RGB only textures (without adding a useless alpha channel) and eg. for greyscale images like heightmaps
- Simplyfied iV_loadImage_PNG (formerly known as pie_PNGLoadFile, s.a.) and also removed lots of seemingly unnecessary conversions
- Converted page-8 from paletted to RGB for simplification. This multiplied the size by about 3x (still < 100kB)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1580 4a71c877-e1ca-e34f-864e-861f7616d084
2007-05-01 20:34:54 +00:00
Giel van Schijndel 6e33bd7cbb * Make progress bar white again
apparently we need a glDisable(GL_TEXTURE_2D) call at some times, or do nothing at other times, this is determined by pie_SetTexturePage by use of some global state, and the texture index, in other words pie_SetTexturePage to me seems like a dirty hack, but we need it for the moment

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1579 4a71c877-e1ca-e34f-864e-861f7616d084
2007-05-01 15:37:20 +00:00
Giel van Schijndel b0f7797d93 Update MSVC project file for the removal of pcx.c and addition of png_util.[ch] and oggvorbis.[ch]
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1578 4a71c877-e1ca-e34f-864e-861f7616d084
2007-05-01 09:40:46 +00:00
Giel van Schijndel f64c7015f2 * remove dependency list of $(PATCHLIST) because it resides in a subdirectory which is not visible to make (which in turn causes make to complain about unmet dependencies)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1577 4a71c877-e1ca-e34f-864e-861f7616d084
2007-05-01 08:56:17 +00:00
Giel van Schijndel e92207f7e8 * Prevent out-of-bounds coordinates from reaching map_Height and causing a segfault in the process
Patch by Watermelon

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1576 4a71c877-e1ca-e34f-864e-861f7616d084
2007-05-01 08:49:13 +00:00
Giel van Schijndel e252c12161 remove an unnecessary debug-statement
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1575 4a71c877-e1ca-e34f-864e-861f7616d084
2007-05-01 08:45:44 +00:00
Giel van Schijndel 9c0a67102d * Utilize OggVorbis decoding function from oggvorbis.[ch] instead of own implementation
* char* -> const char*

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1574 4a71c877-e1ca-e34f-864e-861f7616d084
2007-05-01 01:08:48 +00:00
Giel van Schijndel c4d97027ba * Fix a memory leak (didn't free the buffer we received, after using it)
* Remove the ability to decode into a specified buffer from sound_DecodeOggVorbis altogether, we now only use a buffer we malloc'ed ourselves
  * this might be slightly slower for streaming (depending on the malloc implementation), but can be easily optimized away by just increasing the buffer size (which IMO is a better optimization, because it's _a_lot_ simpler)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1573 4a71c877-e1ca-e34f-864e-861f7616d084
2007-05-01 00:30:37 +00:00
Giel van Schijndel 8a5c7d9f6d * remove ability to resize external buffer (realloc) because this made the code overly complex while providing only little gain
* instead we now just calculate the precise amount of memory needed ahead of time and just malloc for decoding of each track (decoding only occurs while loading so these extra malloc calls shouldn't go at the expense of performance)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1572 4a71c877-e1ca-e34f-864e-861f7616d084
2007-05-01 00:04:37 +00:00
Giel van Schijndel bfad55739b * modularize OggVorbis decoding code:
* remove OpenAL dependency of oggvorbis.[ch]
  * move sound_DecodeOggVorbisTrack to openal_track.c

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1571 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-30 23:52:51 +00:00
Ari Johnson d84e7fbf27 Warning linting on Mac OS X
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1570 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-30 20:42:18 +00:00
Ari Johnson bf0a74258a Updated Xcode project
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1569 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-30 20:41:51 +00:00
Giel van Schijndel c4ad4d1ca8 * remove a possible memory leak in sound streaming code
* some minor code cleanup

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1568 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-30 19:24:46 +00:00
Giel van Schijndel 68abda7ae7 make -C po update-po
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1567 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-30 18:00:08 +00:00
Giel van Schijndel bdb506f697 * move OggVorbis decoding functionality to oggvorbis.[ch]
* did _not_ add copyright statement for "Eidos" to new files since Eidos never wrote anything about this OpenAL/OggVorbis code (if anyone thinks I'm wrong in doing this, please say so on the mailinglist)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1566 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-30 17:58:27 +00:00
Giel van Schijndel 1643e335e4 * remove unneeded header include directives
* use plain data types where appropriate
 * move the decision for streaming to a parameter of the decoder function (less tight coupling of client to internal decoder callbacks)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1565 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-30 16:55:53 +00:00
Giel van Schijndel 53a8aebb9c * Remove "inline" keyword from function gridIterate as it is declared "extern" in the header file and used in other files as well (but wasn't called anywhere in mapgrid.c)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1564 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-30 15:21:30 +00:00
Giel van Schijndel 805f51bc75 * remove use of "template" as a variable name
This prevents nameclashes with the C++ "template" keyword when compiling with a C++ compiler.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1563 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-30 14:15:46 +00:00
Giel van Schijndel d6758391d8 * Fix nameclash of <png.h> with lib/ivis_common/png.h
* renamed lib/ivis_common/png.[ch] to lib/ivis_common/png_util.[ch]

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1562 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-30 14:09:33 +00:00
Ari Johnson c62421a6ad Updated Xcode project to reflect pcx.c -> png.c change
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1561 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-30 02:10:22 +00:00
Giel van Schijndel 82eee99004 * Move PNG dumping code from screen.c to png.c
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1560 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-29 23:00:38 +00:00
Giel van Schijndel aff4430378 * Move PNG specific code to png.[ch] (PNG saving code still needs moving though)
NOTE: this _WILL_ require updating the MSVC project file

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1559 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-29 22:19:21 +00:00
Per Inge Mathisen e127a1d32c Code cleanup and remove unused code. There should be no behaviour changes.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1558 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-29 21:42:22 +00:00
Giel van Schijndel 587498fbb1 * Clear up assert x&y asserts in map_Height by specifying the specific values there
* Use macro WORLD_COORD() instead of `<< TILE_SHIFT`

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1557 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-29 21:26:43 +00:00
Dennis Schridde 8455086b4b Remove deleted bsp files from vcproj
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1556 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-29 20:05:07 +00:00
Per Inge Mathisen 17d9b945fb Cosmetic cleanup of flattenimd function for more readability
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1555 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-29 18:02:07 +00:00
Giel van Schijndel 675c4a0a57 * Keep X&Y values passed to map_Height (directly or indirectly) within safe range
Patch by Watermelon: display3d.c part of projfix13e (with fixes by Per; MAX/MIN and append - 1 to fix indexing; did not include code cleanup)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1554 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-29 17:32:19 +00:00
Giel van Schijndel cb6bd9bd2b * Keep X&Y values passed to map_Height (directly or indirectly) within safe range
Patch by Watermelon: combat.c part of projfix13e

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1553 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-29 17:25:03 +00:00
Giel van Schijndel 7ea54b2f8c * Fix target attack weight/priority for dead droids
Patch by Watermelon in Message-ID: <ca0601900704280511l265fdebbl23629f2b3cabcda7@mail.gmail.com>

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1552 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-29 15:31:43 +00:00
Per Inge Mathisen 123475ef6b Reorder some code for readability.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1551 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-29 12:38:21 +00:00
Dennis Schridde e5e418c480 - Sample prototype for a PNG saving function
- Vector2f type which will be needed for texture coordinates
- Output adjustment for pie_AddTexPage


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1550 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-29 00:58:39 +00:00
Per Inge Mathisen 03c620620b Fix bug that would prevent IMDs with more than 256 points from being
properly flattened.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1549 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-28 23:26:20 +00:00