Commit Graph

1927 Commits (623ac960aed6c4f9fe17999e280699f7b2f6638c)

Author SHA1 Message Date
Per Inge Mathisen d90e50c0b1 Add shadows on/off GUI option in graphics options menu.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2301 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-31 20:44:24 +00:00
Per Inge Mathisen f999c48d46 Rewritten texture loader. The textures are reimported from the original PCX files,
since they old ones we had had scaling artifacts on the edges, and they have been
split up into one file per texture. We now also use custom mipmaps down to 16x16 
size for improved scaling and interpolation. Texture page (atlas) assembly is now
done with OpenGL rather than by shuffling pixels directly in memory.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2300 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-31 20:16:38 +00:00
Giel van Schijndel fd74d682e5 * remove forward declaration of undefined and unused function iV_GetTextExtents
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2299 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-31 19:39:49 +00:00
Per Inge Mathisen 6ee32dba61 New cheat code: "tileinfo". Gives you information about the tile under the cursor.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2298 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-31 19:31:48 +00:00
Giel van Schijndel 0832e1f5eb * Fix warning about suggested parentheses
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2297 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-31 14:20:28 +00:00
Giel van Schijndel e9d8948939 * Just use uint32_t to store UTF-32 (or UCS-4) characters in rather than uint_fast32_t which probably falls into the category premature optimization
* Fix macro ASSERT_START_OCTET (I used a logical and there instead of logical or)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2296 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-31 14:17:35 +00:00
Per Inge Mathisen af3631c5f9 Get radar colours from radar text files instead of samples of the terrain tiles.
The radar files use HTML-like hex values for colours (ie FFFFFF is clear white).


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2295 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-31 13:02:31 +00:00
Per Inge Mathisen 179f89cbad Improve logging for tracking down resource loading bugs.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2294 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-31 12:47:08 +00:00
Giel van Schijndel 17ac519765 * Assert that the starting octect of a UTF-8 codepoint sequence is correct
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2293 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-31 12:07:12 +00:00
Per Inge Mathisen ce56538fba Revert commit r2258 which made texture coordinates into floating point. It
caused bug #9631, wrong team colours displayed.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2292 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-30 20:20:06 +00:00
Giel van Schijndel 9b31055f08 * make pie_DrawFormattedText const correct ("char*" -> "const char*")
* Don't use a hundred and two different methods of determining the end of nul terminated string
 * Use pointers into the string rather than integers as "iterators"

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2291 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-30 17:03:02 +00:00
Giel van Schijndel 1b2ee6ae43 * Fix undeclared identifier
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2290 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-30 16:46:37 +00:00
Giel van Schijndel 518fd90693 * Mismatched declaration and definition
* function was declared unsigned int, but defined as int; now it's unsigned int in both

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2289 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-30 16:44:56 +00:00
Ari Johnson 44dd9e4dc9 Added lib/framework/utf8.[ch] to Xcode project
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2288 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-30 16:44:03 +00:00
Giel van Schijndel 3cbe1ed25a * Clean out iV_GetCharWidth to make it more readable (it also returns an unsigned int rather than a signed one now)
* Define iV_GetTextWidth in terms of iV_GetCharWidth now (rather than copy&paste implementations)
 * iV_GetTextWidth now also returns an unsigned int

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2287 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-30 16:42:37 +00:00
Giel van Schijndel ed18068ec8 * Forgot to return the determined length value of unicode_strlen: doh!
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2286 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-30 16:28:38 +00:00
Giel van Schijndel 7c73b0a9e1 * Add function "size_t unicode_strlen(const utf_32_char* unicode_string)" which determines the amount of characters in a UTF-32 encoded string
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2285 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-30 16:27:39 +00:00
Giel van Schijndel f78bb18a5b * Use a typedef utf_32_char in the UTF-8 code to store UTF-32 characters in
* This way it should be easy to change the type of utf_32_char if ever needed (currently it is uint_fast32_t)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2284 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-30 15:34:44 +00:00
Giel van Schijndel 100309f547 * Provide implementation of function "uint_fast32_t* utf8_decode(const char* utf8_string)" which decodes a UTF-8 encoded string into a UTF-32 (native endianess) encoded Unicode string (UTF-32 is the "native" unicode encoding)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2283 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-30 15:15:02 +00:00
Giel van Schijndel 8bbe10a748 * Provide implementation of function "size_t utf8_character_count(const char* utf8_string)" which counts the amount of characters (not bytes/octects!) in a UTF-8 encoded string
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2282 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-30 14:46:15 +00:00
Giel van Schijndel 38a82a2ada * Add UTF-8 encoder (the decoder is a WIP)
* Add files lib/framework/utf8.[ch] to autoconf/automake, raw makefiles, Code::Blocks and MSVC
NOTE: this may require updating of some additionaly buildsystems (e.g. OSX)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2281 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-30 14:02:05 +00:00
Giel van Schijndel 87c955e52e * Add locale directory to raw makefile buildsystem
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2280 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-30 12:08:35 +00:00
Dennis Schridde f363f0b8a9 Workaround for bug#9455. The issue which causes this must sit elsewhere and should be fixed there.
This fix may not be needed for the trunk, since maybe the real issue is already fixed! Commiting it just in case...


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2279 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-30 11:18:23 +00:00
Dennis Schridde 673ae4aa65 update-po
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2277 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-30 00:57:37 +00:00
Dennis Schridde f509873c0e mp-names.patch by Martin Koller.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2276 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-30 00:27:33 +00:00
Dennis Schridde 2fbaec50c4 Fix unused function getLanguage.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2275 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-29 23:33:21 +00:00
Dennis Schridde ca4810c78a Greatly enhanced german translation by Ryo: 2012 translated messages, 16 untranslated messages.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2274 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-29 22:15:43 +00:00
Per Inge Mathisen 9c6c62ff7f Make PNG loader a little less picky about the PNG format being exactly correct.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2273 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-29 17:42:22 +00:00
Per Inge Mathisen 464e580967 Roll back the latest, accidential change to this texture page.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2272 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-29 17:41:21 +00:00
Dennis Schridde 8939a96d21 Better debuging of not found data.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2270 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-29 17:17:38 +00:00
Dennis Schridde f612678624 Backport r2265,2266,2268 from branches/2.0
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2269 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-29 16:58:16 +00:00
Giel van Schijndel 0931065023 * Use dynamic_cast<T*> instead of wxWidgets' own RTTI implementation (t*)->IsKindOf(CLASSINFO(T))
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2267 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-29 16:55:19 +00:00
Giel van Schijndel 0a310fdd5c * Use dynamic_cast<T*> instead of a C-style (T*) cast (dynamic_cast is safer since it walks the inheritance tree to check whether the pointer is actually of type T)
* Also dynamic_cast<T*> (which is compiler supported) should not be slower (if not faster) than wxWidgets' own RTTI implementation (t*)->IsKindOf(CLASSINFO(T))

This _does_ require RTTI to be enabled in wxWidgets' compilation; just enabling RTTI (as a compiler option) will only increase binary size, it should not add runtime overhead

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2264 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-29 16:45:40 +00:00
Giel van Schijndel bab9bd3316 * Add conversion functions for converting wxString <-> std::string (we're assuming UTF-8 encoding for std::string here)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2263 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-29 16:30:25 +00:00
Giel van Schijndel bba2360eef * Add another ported dialog: InitialLimitsDialog; to directory wxDialogs
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2262 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-29 15:56:39 +00:00
Giel van Schijndel c4b9711e46 * Don't return a reference to a temporary; instead return by value
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2261 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-29 15:47:27 +00:00
Giel van Schijndel 32f0b5bb1b * Minor cleanup:
* remove some unnecessary #include directives
  * add header guards
  * declare some member functions const
  * Add "const std::string& InitialLimitsDlg::SelectedString() const" which retrieves the string of the currently selected item

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2260 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-29 15:43:01 +00:00
Giel van Schijndel 087703e801 * Replace usage of ListNode<CScrollLimits> by class CHeightMap by std::list<CScrollLimits>
* Some const correctness: "char*" -> "const char*"
 * Fix a bug "if (a = b);" -> "if (a == b);"
 * Fix a possible error where NULL might be dereferenced in CHeightMap::DrawScrollLimits (actually if that function would be called dereferencing NULL would be inevitable)
 * Use references for output parameters rather than pointers
 * If we use operator new[] then we should use operator delete[]
 * Remove workaround for bad std::advance implementation since we're not using advance with our own iterators anymore

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2259 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-29 14:04:24 +00:00
Dennis Schridde 723f9bfaa1 Use float texture coordinates in the range 0.0-1.0.
Any fixes, if necessary, should be applied on loading.
In the image code (IMAGEDEF) this did not work, so OLD_TEXTURE_SIZE_FIX is applied during rendering.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2258 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-29 13:32:21 +00:00
Giel van Schijndel 8310f9170e * Replace usage of ListNode<GateWay> by class CHeightMap by std::list<GateWay>
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2257 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-29 12:51:49 +00:00
Dennis Schridde 87fd4e97f9 Add missing locale directory.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2256 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-29 12:37:32 +00:00
Giel van Schijndel 817e2ace65 * Replace usage of ListNode<C3DObjectInstance> by class CHeightMap by std::list<C3DObjectInstance>
* Make all member functions of CHeightMap that have an argument list declaration of "(void)" use "()" instead
 * Rename std::advance in limitsdialog.cpp to just advance since it otherwise conflicts with MSVC's (flawed) implementation

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2255 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-28 20:00:57 +00:00
Giel van Schijndel cdc92ebfe6 * Apply ListNode<T>::iterator in class CBTEditDoc
* Initialize CHeightMap's member variables using the constructor's initalization list rather than its body

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2254 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-28 17:54:08 +00:00
Roman C 37a658ef06 Target selection routine update:
- units attached to a commander will now tend to attack units that attack their commander, when they have no explicit target. The higher rank the commander has, the bigger is the chance that attacker of the commander will be attacked.

- units attached to a commander will give more priority to the targets that are already attacked by other members of the same commander group.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2253 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-28 16:39:20 +00:00
Ari Johnson 993ae8e46f Added nettypes.[ch] to Xcode project file
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2252 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-28 14:40:17 +00:00
Giel van Schijndel d50c04ef6b * Replace usage of ListNode<C3DObjectInstance> by class CBTEditDoc by std::list<C3DObjectInstance>
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2251 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-28 14:34:28 +00:00
Giel van Schijndel bca3e1f535 * Some const correctness
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2250 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-28 14:30:05 +00:00
Dennis Schridde 1ade603eb1 Some more minor adjustments.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2249 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-28 14:05:21 +00:00
Giel van Schijndel 4ef9247c6a * Move CBTEditDoc's member initialisation from the constructor's body into the initialization list
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2248 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-28 14:05:19 +00:00
Dennis Schridde 27f505a3f5 Some renamings and cleanups to simplify the upcoming float uv patch.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2247 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-28 13:50:16 +00:00