with corrupted player name and such when mixing 2.0 and 2.1 versions, or old
and new versions of 2.1.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2070 4a71c877-e1ca-e34f-864e-861f7616d084
with other objects. To quickly adapt your patches and avoid conflict noise, run this
on the revision prior to this one:
sed -i s/OBJ_BULLET/OBJ_PROJECTILE/g src/*.c src/*.h src/*.l src/*.y
sed -i s/PROJ_OBJECT/PROJECTILE/g src/*.c src/*.h src/*.l src/*.y
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2061 4a71c877-e1ca-e34f-864e-861f7616d084
SDL_net.h: Where the SDL headers are not in a standard include path it sometimes seems to have problems with it.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2057 4a71c877-e1ca-e34f-864e-861f7616d084
- pie_MAX_POLYS became pie_MAX_POLYGONS.
- pie_MAX_POLY_VERTS became pie_MAX_VERTICES_PER_POLYGON and was decreased to 6 from 10. This _should_ work everywhere, I didn't see glitches. Grim recommended to even reduce it to 4, but the terrain renderer didn't like that. (When you pitched down the camera too much, the left screen side of the terrain disappeared.)
- iV_IMD_MAX_POINTS, iV_IMD_MAX_POLYS now are defined to the pie_ variants.
- scrPoints was moved into the scope of the only using function, pie_Draw3DShape2.
- aByteScale was never used, so it got removed.
- Some counters were changed from signed to unsigned.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2054 4a71c877-e1ca-e34f-864e-861f7616d084
Previously those displayed images instead of the appropriate letters.
This still doesn't allow for UTF-8 strings (since multi-byte characters are not handled), but it should work with ISO8859-X encodings.
Patch by Martin Koller.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2053 4a71c877-e1ca-e34f-864e-861f7616d084
to them are not. Bug looks like it has always been there, but hidden by old memory
management code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2050 4a71c877-e1ca-e34f-864e-861f7616d084
level of cam2 because the non-nullness of an array pointer is checked instead of
the non-nullness of the first pointer in that array.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2048 4a71c877-e1ca-e34f-864e-861f7616d084
* Make use of the fact that FUNCTIONALITY is a union and work some casts away
* Turn some bitshifting with TILE_SHIFT into map_coord and world_coord function calls
* Merge some duplicated code in function resetFactoryNumFlag
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2045 4a71c877-e1ca-e34f-864e-861f7616d084
* Use calloc instead of malloc followed by memset(0) (calloc both allocates memory; and then sets all of it to zero)
* Move a lot of duplicated malloc (calloc now) calls out of the switch statement; and in front of it
* Use map_coord and world_coord instead of bitshifting with TILE_SHIFT
* Declare and use variables in a more local scope
* Take advantage of the fact that FUNCTIONALITY now is a struct by not casting anymore
Parts from patch by Freddie Witherden <evilguru> plus changes by me
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2044 4a71c877-e1ca-e34f-864e-861f7616d084
* Remove commented out line which was an exact duplication of a line just below it
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2041 4a71c877-e1ca-e34f-864e-861f7616d084
* Make droidDamage and objectDamage accept a parameter `DROID_HIT_SIDE impactSide` instead of `int angle` since it only needs to know the impactSide (which can be extracted from the angle)
* Make some function calls better readable by splitting them decently out across lines (not just random line breaks)
* Merge some recursive if-statements (i.e. make if (a) { if (b){} } become if (a && b) instead)
* Move duplicated code into a function of its own (getHitSide)
* Merge a large portion of duplicated code (parts that dealt with direct and indirect weapons were almost exactly the same)
* Remove futile collision check based on checking whether targets where in the same tile as the projectile on impact (some more advanced collision detection was/is being performed anyhow)
Parts from patch #760 by Freddie Witherden <evilguru> plus some minor changes by me
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2039 4a71c877-e1ca-e34f-864e-861f7616d084
* Put curly braces on a line of their own
* Use INT16_MAX and INT16_MIN instead of magic numbers
* Make some global vars statically linked and const (since they're constants for the adpcm audio codec only)
* Make some functions in rpl_reader statically linked (they're only used in that file)
* Add include file dec130.h instead of forward declaring functions in source files
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2036 4a71c877-e1ca-e34f-864e-861f7616d084
* Merge two large sequential if statements where the tested conditions where exactly the same
* Remove some commented out code
* Move some code duplicated in the true and false (else) parts of an if-statement out of those code blocks in front of the if-statement
* Don't use multiple recursive if-branches, instead store some results in variables (EFFECT_TYPE facing, iIMDShape *imd)
* Use a switch statement to switch on a BASE_OBJECT's type rather than a sequence of if/if-else statements
* Merge some recursive if-statements (i.e. make if (a) { if (b){} } become if (a && b) instead)
* Make some function calls better readable by splitting them decently out across lines (not just random line breaks)
* Add some whitespace for increased readability
Parts from patch #756 by Freddie Witherden <evilguru> plus some changes by me
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2035 4a71c877-e1ca-e34f-864e-861f7616d084
* Fix merged indentation of 4 spaces and tabs (even on the same line!!) by using tabs instead
* Make some function calls better readable by splitting them decently out across lines (not just random line breaks)
Parts from patch #756 by Freddie Witherden <evilguru> plus some changes by me
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2034 4a71c877-e1ca-e34f-864e-861f7616d084
* Change an assert(FALSE) into a more descriptively styled: !"text string"
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2030 4a71c877-e1ca-e34f-864e-861f7616d084
* Add some whitespace to increase readability (empty lines between different case labels in switch statements, and use more consistent indentation in switch statements)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2027 4a71c877-e1ca-e34f-864e-861f7616d084
* Don't use pointers to fileParser for functions where references are lots more appropriate
* Mark some functions private instead of public (they're only used by class CHeightMap's implementation)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2025 4a71c877-e1ca-e34f-864e-861f7616d084
* Remove useless, and (luckily) unused default constructor from CFileParser
* Move initialisation of m_Flags to initialization list of constructor
* Don't use (void) as argument list of destructor (this is bad style in C, but especially so in C++, since C++ implies an empty argument list if you give one)
* Don't check whether new didn't return NULL, since we're using the throwing variant of new anyway
* Use istream.read instead of istream.readsome since the former will refill the buffer if necessary (which *is* necessary to be able to read something the first time)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2022 4a71c877-e1ca-e34f-864e-861f7616d084
* Use C++'s std::ifstream instead of stdio from C at some locations
* remove unused constructors from CFileParser (FILE* Stream, short Flags), (char* Buffer, long BufferSize, short Flags) and member function Create(char* FileName, short Flags)
* remove some duplicated code from fileparse.cpp
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2020 4a71c877-e1ca-e34f-864e-861f7616d084
invalid target references. This is an ugly fix for some very ugly code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2019 4a71c877-e1ca-e34f-864e-861f7616d084
Per Inge Mathisen
Ari Johnson
Dennis Schridde
Giel van Schijndel