Commit Graph

141 Commits (516067dec0b14c4bc99c5ce648811c27c39966db)

Author SHA1 Message Date
Giel van Schijndel 79ea5bb199 * Update EditWorld's TODO file
* Add list of files requiring porting from MFC to wxWidgets

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2202 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-26 10:54:32 +00:00
Giel van Schijndel b543a89e13 * #include required header <ostream>
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2201 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-26 10:50:50 +00:00
Giel van Schijndel 20d790a4fa Cleanup:
* Rename class CKeyHandler to KeyHandler (I don't want freaking MFC style classnames being prefixed with 'C')
 * Modify class KeyHandler to use std::bitset instead of an array of bools
 * Use forward declarations for pointers instead of including the entire header

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2200 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-26 10:50:15 +00:00
Giel van Schijndel 6634aa66fa * Remove unused files debug.[ch]
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2199 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-26 09:40:03 +00:00
Giel van Schijndel f10cdeb157 * Make debugprint.c a C++ file instead of C
* Use std::ostream instead of FILE* for debug printing

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2198 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-26 09:36:45 +00:00
Giel van Schijndel 595c4838ac * Use stack allocated objects instead of heap allocated; since they're safer (don't require explicit deallocation), and it's obvious that the only reason why they where heap allocated is probably that whoever wrote that piece of code was addicted to the "operator new"
* Use std::ostream instead of FILE* for PCXHandler::WritePCX
 * Change utility functions EncodeLine and EncodedPut to work with std::ostream instead of FILE* now

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2197 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-26 00:50:32 +00:00
Giel van Schijndel 2fcc6e82c2 * Use std::istream instead of FILE* for PCXHandler::ReadPCX
* Change private member functions of PCXHandler; EncodedGet, EncodeLine and EncodedPut into static, inline, non-member, utility functions (EncodedGet now also works with std::istream)
 * Use std::string for the composition of strings, rather than some char[] buffer and strcpy + strcat

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2196 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-26 00:18:21 +00:00
Giel van Schijndel 06afa3c7a0 * Less violation of encapsulation: use private instead of protected (since we don't need access to these members anyway; plus we don't inherit from these classes ATM)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2190 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-25 14:58:16 +00:00
Giel van Schijndel f54618b6c4 * Remove files gateinterface.* which basically where a C<->C++ interface to the gateway* files (these are now C++ files)
* Move previous interface functions into gateway.cpp

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2187 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-24 18:49:29 +00:00
Giel van Schijndel 5a9cc58788 * Fix yet some more dependencies in header files
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2186 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-24 18:44:18 +00:00
Giel van Schijndel 2e28b1926a * Fix some header dependencies
* Indent class CHeightMap in a more readable manner

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2183 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-24 18:05:32 +00:00
Giel van Schijndel c05b65d532 * Fix compile error by including dependent header (<windows.h>: ugh)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2182 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-24 17:43:48 +00:00
Giel van Schijndel 4c7f823d2f Cleanup
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2181 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-24 17:34:28 +00:00
Giel van Schijndel 91b10bd4db * Modify function IsPower2 into a static inline
* Make IsPower2 take advantage of the mathematical properties that a number which is a power of two has (which is that a number which is a power of two minus one has _no_ matching bits with the number that is power of two); this severely decreases the complexity of this function (previous one looped over all bits)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2180 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-24 16:51:17 +00:00
Giel van Schijndel d48c7f67a4 * Make C file gatewaysup.c a C++ file gatewaysup.cpp
* Remove macro MALLOC
 * Use reinterpret_cast for the malloc stuff

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2179 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-24 15:49:19 +00:00
Giel van Schijndel b06b660b6a * Remove all stuff which wasn't compiled when EDITORWORLD is not defined; also remove the macro EDITORWORLD itself
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2178 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-24 15:34:39 +00:00
Giel van Schijndel 9a630f45f5 * Turn C file gateway.c into C++ file gateway.cpp
* Turn linked list macro LIST_REMOVE into inline function list_remove
 * Remove macro MALLOC and use malloc instead (MALLOC was defined as malloc anyway)
 * Replace some UBYTEs with chars

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2177 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-24 15:14:50 +00:00
Giel van Schijndel 763d707f02 * Fix warning about implicit declaration of memset
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2176 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-24 15:08:29 +00:00
Giel van Schijndel 2b00b2e4c1 * Add svn:keywords
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2175 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-24 14:54:31 +00:00
Giel van Schijndel 20a03d68cc * Add GPL header (which apparently I forgot on this file)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2174 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-24 14:53:22 +00:00
Giel van Schijndel 1ec5cc8fb2 * Remove unused parameter `bool Flip` from BMPHandler::WriteBMP (only it's default value "false") was used
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2173 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-24 13:36:18 +00:00
Giel van Schijndel 7873df53f1 * Remove unused member functions from class BMPHandler: ReadBMP, Clear, GetBitmapWidth and GetBitmapHeight
* Remove unused BMP palette code, since obviously we're not using it
 * Remove two other unused parameters from BMPHandler::Create: `void* Bits`, `bool Is555`

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2172 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-24 13:25:33 +00:00
Giel van Schijndel e94d4a1e5a * Forgotten in last commit: removal of parameter from calling function
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2171 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-24 12:56:07 +00:00
Giel van Schijndel 76fe009e44 * Change protected section of class BMPHandler to a private section
* Remove unused parameter PALETTEENTRY* Palette from function BMPHandler::Create
 * Change BMPHandler::GetBitmapWidth's return value to `unsigned int`
 * Use std::vector for an "array" of PALETTENTRYs instead of a plain array
 * Add a type CopyAblePALETTEENTRY which's definition is similar to PALETTEENTRY; with as difference that it has a copy assignment operator (so that we can use this type with std::copy, and other algorithms from the Standard Library)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2170 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-24 12:52:10 +00:00
Giel van Schijndel 3f342f72a9 * Fix spelling error in MSVC project file (got there due to my manual conversion probably)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2168 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-24 12:05:07 +00:00
Giel van Schijndel d3628a0d11 * Don't use (void) as argument list for functions anymore; with C++ this is implicit when using (), a variadic function has to be explicitly declared using (x, y, ...)
* Replace BOOL, TRUE and FALSE with bool, true and false respectively
 * Use the initializer list of the constructor instead of its function body for member variable initialization
 * Replace usage of "operator delete" with "operator delete []" where the respective pointer had its memory allocated using "operator new []" (not doing so may cause heap corruption)
 * Don't if (pointer != NULL) delete pointer; since delete NULL is a valid no-op.
 * declare variables in a more local scope
 * Use algorithms instead of custom implementations; e.g. std::swap rather than { tmp = x; x = y; y = tmp}
 * Use reintrepret_cast<T> at some places instead of a C style cast, since these casts are really bad in this case (i.e. unnecessary), but they're easier to recognize this way

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2165 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-23 14:51:22 +00:00
Giel van Schijndel 8947c63baf * Ignore another set of MSVC files
* Remove rather useless file d3dwrap.h
 * Remove DLLEXPORT stuff

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2026 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-04 18:53:52 +00:00
Giel van Schijndel 0a8c53b8a8 * Rename class CFileParser to fileParser (I don't want no freakin MFC naming conventions: prefixing all class-names with a captital 'C')
* 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
2007-07-04 18:31:36 +00:00
Giel van Schijndel eb898d0293 * Fix forward declaration of OpenEditorFile
* 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
2007-07-04 18:11:02 +00:00
Giel van Schijndel f0d6c4d6b6 * Remove yet some more unused/unreferenced variables to reduce warning spam
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2021 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-03 20:51:41 +00:00
Giel van Schijndel d4d550f700 * Remove some unused variables
* 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
2007-07-03 20:44:51 +00:00
Giel van Schijndel 28152bd17f * Add GPL header
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2016 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-03 14:42:34 +00:00
Giel van Schijndel bae4d98dfa * Remove empty file gatewaymapdefs.h
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2015 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-03 14:38:37 +00:00
Giel van Schijndel 4b642cbdb7 * Rename wrongly named file model.hpp to model.h
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2014 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-03 14:30:48 +00:00
Giel van Schijndel cd5ada2263 * Use a tab-stop location to line stuff properly out
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2012 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-03 13:27:24 +00:00
Giel van Schijndel f0c12b8ae2 * rename some files to lowercase filenames
* convert M$ Word documents into OpenDocument text documents (OpenOffice.org handles this perfectly) (lets use open standards instead of property formats!)
 * remove WEDIT.DOC which seems to have been a duplicate of MANUAL.DOC or the otherway around, which doesn't matter really

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2011 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-03 13:24:14 +00:00
Giel van Schijndel 49b672aad7 * Remove a whole bunch of other MSVC files which apparently are not necessary
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2010 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-03 12:02:24 +00:00
Giel van Schijndel a1b1ac1f16 * Add tools/editworld/src/Debug to the ignore list since apparently this is MSVC's output directory
* Remove EditWorld.plg since this looks like a compilation report which we don't need in our repository (add it to the ignore list as well)
 * Another MSVC compilation output file to ignore list: EditWorld.ncb

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2009 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-03 11:59:52 +00:00
Giel van Schijndel 24e16176b8 * Allow larger display bitdepths than 16bit
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2008 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-03 11:54:35 +00:00
Giel van Schijndel 10a0d4be6e * Set mime-types and svn:eol-style on EditWorld's files
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2007 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-03 11:48:40 +00:00
Giel van Schijndel 345b1d6106 * Revive EditWorld from the dead
* Give it a nicely oriented directory structure
 * Rename all files in src/ (I hope I didn't miss any) to lowercase (except for MSVC project files)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2005 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-03 11:06:42 +00:00