marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
8,678 Commits
27 Branches
0 Tags
318 MiB
Commit Graph

348 Commits (544c1cbb4bb6da97d30571ff28772660c7ad5969)

Author SHA1 Message Date
Armin Burgmeier 1660ed310a Add support for the OGRE 1.8 binary mesh format 2012-10-08 21:50:20 +02:00
Armin Burgmeier 6661f8b8cb Fix a crash when attaching a mesh by definition fails 2012-06-30 22:04:48 +02:00
Günther Brammer 15b07ca717 Start counting lines and columns in text files with 1 
I checked two text editors, and they did that, too.
Also implement the special rules for tab stops, assuming a tab width of 8.
 2012-05-16 23:21:14 +02:00
Nicolas Hake 1711b72baf Return U+FFFD REPLACEMENT CHARACTER instead of question mark for invalid utf8 
Since U+003F QUESTION MARK is a potentially valid character in a unicode string,
have the text iterator return U+FFFD if it can't decode its input instead. This
way the caller can be certain that the input isn't a proper question mark and
doesn't accidentally use it, e.g. as a wildcard.
 2012-05-04 18:12:35 +02:00
Armin Burgmeier 04af38622d Use 64 bit integers to multiply fixpoint numbers 
gcc 4.6 generates better code for FIXED_EMULATE_64BIT disablen for both
32 and 64 bit. It properly recognizes that the 32,32->64 multiplication
instruction of the x86 is the right choice for the job whereas the more
complicated FIXED_EMULATE_64BIT version requires multiple multiplications

Thanks Günther for checking this! :)
 2012-05-01 23:05:40 +02:00
Armin Burgmeier 5d96ca83c9 Fix overflow in C4Fixed multiplication 
This would happen when the product of the lower significant part, which is
between 0 and 65535 (even though C4Fixed is a signed data type!) exceeds
2^31, for example for val=36864, fVal2=61440.
 2012-05-01 22:59:55 +02:00
Günther Brammer 1a29f8625d Reorder engine source file organization a bit 
This mostly consists of flattening the hierarchy, splitting the
graphics stuff out of platform, and a few smaller cleanups.
 2012-04-27 19:04:43 +02:00
Günther Brammer b4fd8fcd15 linux: Add O_CLOEXEC to various open calls 
This should prevent some file descriptor leakage from forks that
some libraries we use do.
 2012-03-05 01:33:02 +01:00
Günther Brammer dfea0914a9 Merge the functions pointer branch 2012-03-09 17:42:48 +01:00
Armin Burgmeier 7f5f916e76 Draw only partial set of faces for buildings in construction 2012-02-26 01:09:42 +01:00
Armin Burgmeier 9d94b1da6e For scaled sprite graphics, don't interpret Picture coordinates as scaled 
Otherwise an object with a scale of 5 and a picture of 64x64 (such as the
Metal and the GoldBar objects) cannot properly set the picture rectangle.
 2012-02-25 17:35:24 +01:00
Armin Burgmeier 9dc9ad4ca7 Fix initialization of AlphaToCoverage material property 2012-02-19 17:45:01 +01:00
Günther Brammer cd46cf9914 C4SimpleLog defaults to on 2012-02-17 00:25:20 +01:00
Nicolas Hake db9ff85116 Binary mesh loader: Do not reject meshes with multi texturing 
We don't support multi texturing in the rendering code, so emit a warning when
this happens
 2012-02-16 00:45:48 +01:00
Nicolas Hake ac8edd6e20 Binary mesh loader: Support animations without tracks 2012-02-16 00:34:31 +01:00
Armin Burgmeier 8dae8c111d Implement XML loading support for geometry shared between submeshes 
The new OGRE blender exporter (2.6) creates meshes which make use of this
feature.
 2012-02-15 23:04:19 +01:00
Armin Burgmeier e52d914638 Read but ignore some more "pass" options in material scripts 
These are the ones that the blender 2.6 exporter sets automatically. We don't
support them yet but we want to be able to load the material script
nevertheless. Many of the additional options are set to their default values
anyway.
 2012-02-13 23:40:47 +01:00
Armin Burgmeier 0749dcdb9d Replace std::sort by timsort for Face ordering 
The usage of timsort instead of std::sort at this point is twofold.  First,
it's faster in our case where the array is already sorted in many cases
(remember this is called at least once a frame). And it's not just a bit
faster either but a lot. I have measured a factor of 7 on my system.

Second, in our Windows autobuilds there is a crash within std::sort which is
very hard to debug because it's hardly reproducible with anything other than
the autobuilds (I tried hard). If the crash goes away with timsort then
great, if not then maybe it's easier to debug since the code is in our tree.
 2012-02-01 22:11:46 +01:00
Felix Wagner d468862159 Player options dialogue, let the player choose a clonk skin 2012-01-29 02:16:22 +00:00
Armin Burgmeier b032b6c3e3 Use std::sort again instead of a custom implemantion for debugging purposes 
This was committed accidentally. I blame hg for having a crappy ui.
Fixes the display of trees again.
 2012-01-28 21:48:07 +01:00
Armin Burgmeier a1370c2954 Rename our custom gz* functions to avoid conflicts with zlib.dll 
This fixes the build with native mingw for me.
 2012-01-28 17:02:37 +01:00
Armin Burgmeier 7e532c2bd6 Split math functions into StdMeshMath.{h,cpp} 2011-12-29 15:41:52 +01:00
Peter Wortmann 638cb919d4 Fixed line drawing coordinate rounding 2011-11-08 16:22:39 +00:00
Günther Brammer ccbf4d1d45 Consolidate duplicated simple Log functions 
The various small utilities do not use the engine Log implementation but
one that simply prints to stdout. Instead of duplicating that one, link a
common one into the utilities.
 2011-11-02 21:36:39 +01:00
Günther Brammer b911630578 Replace OpenSSL SHA1 implementation with one copied from boost/uuid 
Although the code already uses boost, boost/uuid hides the sha1
implementation in a deeply nested namespace, which is just too bizarre to
use. Also the name of that namespace suggests that it is just an
implementation detail that could go away without notice.
 2011-01-10 21:30:40 +01:00
Günther Brammer 5f2f995852 Unify the #include blocks a little bit 
One line for C4Include.h, one for the .h corresponding to the .cpp, one
empty line, the other C4* includes, another empty line, external headers.
 2011-11-01 23:17:41 +01:00
Nicolas Hake 7c34fa9121 Replace RGB player color selection with an HSV chooser (#679) 2011-10-30 20:43:45 +01:00
Armin Burgmeier e44b216230 Enable face ordering individually for all submeshes 2011-10-15 21:35:39 +02:00
Armin Burgmeier f67b20f3f2 Fix a crash when a mirrored animation has a track for only one pair of bones 2011-10-12 21:13:13 +02:00
Armin Burgmeier 8b3a96dcdb Apply animation mirror to bone translation of all keyframes 2011-10-12 20:50:27 +02:00
Nicolas Hake 5ae60485fc Make OC build again 2011-10-09 20:52:13 +02:00
Peter Wortmann 6835b7939d Fixed some warnings, security 2011-10-08 13:02:15 +01:00
Sven Eberhardt e22049c245 Fix writing of Record.log 2011-10-09 20:11:39 +02:00
Armin Burgmeier b532e77872 Fix the build when building against libpng 1.5 2011-10-09 11:15:02 +02:00
Günther Brammer 1cafba4be8 Rename files implementing C4AbstractApp and C4Window 2011-10-03 17:19:24 +02:00
Günther Brammer c2908d5bd5 Rename CStdDDraw to C4Draw 2011-10-03 16:34:08 +02:00
Günther Brammer 2b6f4432de Rename lpDDraw to pDraw 2011-10-03 16:30:18 +02:00
Günther Brammer ad89e12a2c Rename CTexMgr and CTexRef to C4TexMgr and C4TexRef 2011-10-03 16:16:38 +02:00
Günther Brammer 68d6b34f72 Replace SURFACE with C4Surface * 2011-10-03 16:07:07 +02:00
Günther Brammer 55f6bc8d0f Replace CSurface and C4Surface with just C4Surface 
The methods that previously were on C4Surface still are in a separate
file.
 2011-10-03 16:06:41 +02:00
Günther Brammer efed250aa7 Rename CMarkup to C4Markup 2011-08-27 21:13:15 +02:00
Günther Brammer 156a502289 Rename CClrModAddMap to C4FogOfWar 2011-08-27 16:41:26 +02:00
Günther Brammer f4ff47239f Rename CBltTransform, CBltVertex, CBltData, CPattern and CGammaControl 2011-09-30 22:15:51 +02:00
Günther Brammer f055ed27e8 Draw PXS Sprites a little bit smoother 2011-05-26 15:03:51 +02:00
Günther Brammer 562816cfe5 Clean up some unused variables and obsolete FIXMEs 2011-09-28 01:09:56 +02:00
Nicolas Hake 3200fdb088 base64: Replaced char literals by hex literals 
The base64 decoding lookup table uses '\xff' to denote an invalid
value. On compilers where char is signed, this results in a value of
-1, which cannot be converted to an unsigned char in an aggregate
initializer [dcl.init.aggr p2].
 2011-09-28 00:48:00 +02:00
Günther Brammer 9bc61db360 copyright notices update 2011 2011-09-01 16:58:52 +02:00
Sven Eberhardt 3161904bf4 fix C4DrawTransform::IsIdentity 2011-09-01 15:35:12 +02:00
Armin Burgmeier 6c156a22a7 Implement mesh update on definition reload (#76) 2011-08-20 00:01:08 +02:00
Tobias Zwick 532cea1abe removed Cursor graphics in different sizes 2011-08-18 19:06:49 +02:00
Armin Burgmeier e9415252bc Build fix 
Apparently std::map::erase does not return an iterator for some STLs.
 2011-08-18 00:17:43 +02:00
Armin Burgmeier 771163be4b Correctly reload mesh materials on definition reload 
This does not fix #76 yet, but it's a first step.
 2011-08-17 23:50:33 +02:00
Nicolas Hake 0f4e6e8ccd win32: Use wide variants of CRT file access APIs 2011-08-11 15:46:06 +02:00
Nicolas Hake 5f923b0b98 win32: Generate wide strings for OutputDebugString 2011-08-11 15:42:00 +02:00
Sven Eberhardt dcb7e4e54d fix memory leak in binary mesh loader 2011-08-08 16:06:16 +02:00
Benjamin Herr 29aa76dd19 fix loading of scaled graphics again 2011-08-06 20:22:55 +02:00
Sven Eberhardt 8c4e08531e fix loading of scaled graphics (Graphics.*.png) 2011-08-05 20:16:08 +02:00
Tobias Zwick 4a517e06b6 #394 - Separate graphic for "Mouse Over" for main-menu buttons and Icons 2011-08-05 14:24:41 +02:00
Tobias Zwick 221aae1bf5 fixed some ridiculous formatting of consts 2011-08-04 01:30:37 +02:00
Günther Brammer 505b616404 Remove obsolete CStdFile::Load/Save 2011-06-19 16:35:06 +02:00
Peter Wortmann 53247e3c26 Increment RandomCount for non-debugrec builds as well 2011-07-17 13:37:27 +01:00
Armin Burgmeier 5cba420382 Make sure [ChildInstance] named section always exists 
Otherwise loading a savegame with an attached def mesh fails if the mesh
has neither attached meshes or animation nodes since the [ChildInstance]
section ends up empty in which case StdCompilerIniWrite does not write the
section at all.
 2011-06-05 14:12:02 +02:00
Nicolas Hake 23f67b4c8d #606: Accept CSM_Mesh_Bone_Assignment chunks in CSM_Mesh 2011-06-03 21:41:39 +02:00
Peter Wortmann a02ccafc4d Shader landscape rendering, first simple version (scaler, shading) 2011-05-24 00:12:19 +01:00
Nicolas Hake 02416caec5 IsValidUtf8: Obey string length parameter when checking continuation bytes 
This fixes a bug where sequences were incorrectly accepted when they ended with
a multibyte sequence, the end of which was beyond the passed string length.
 2011-05-17 17:55:27 +02:00
Nicolas Hake 1ba02a610b IsValidUtf8: Correctly mask start byte before calculating code point value 
This fixes a bug where valid sequences were incorrectly rejected as having
a value beyond the valid Unicode codepoint range.
 2011-05-17 17:53:21 +02:00
Nicolas Hake e791b14af9 Fix #600 (Unable to change resolution and Fullscreen fails) 
MultiByteToWideChar doesn't do anything when it gets a buffer length of 0,
so it doesn't nullterminate the memory, so EnumerateDisplayModes fails because
of an invalid monitor id.
 2011-05-15 16:06:14 +02:00
Günther Brammer fadacd3bb4 Move StrToI32 to lib/ 2011-05-01 18:55:02 +02:00
Günther Brammer 21e28a4689 Script: Use Unicode instead of Byte strings 
Internally, strings are UTF-8 as before, but GetChar returns an
Unicode code point instead of a byte from the UTF-8 encoded string,
and Format("%c") takes an Unicode code point as well.
 2011-03-10 00:26:31 +01:00
Nicolas Hake c4276e84c4 Split UTF-8 validation out of StdStrBuf 2011-04-05 20:58:40 +02:00
Günther Brammer 702dc65b83 win32: Add helper functions to convert UTF-8 to UTF-16 
They mostly add automatic memory management to MultiByteToWideChar.
 2011-04-02 16:48:54 +02:00
Günther Brammer 2133ed2cd8 Add missing move constructors to StdCopy*Buf 2011-04-02 18:09:46 +02:00
Günther Brammer b46b827cdc Add a few virtual destructors 
This ensures that classes that inherit from these have their destructors
called even if they are deleted with a pointer to the base class.
Though at the moment, this just silences a warning.
 2011-04-02 00:18:14 +02:00
Günther Brammer 5b808be269 Remove some unused variables 
gcc 4.6 finds variables that are write-only.
 2011-03-28 19:31:28 +02:00
Günther Brammer 38ee07e7fc Remove unused third StdStdBuf::ReplaceChar parameter 
C4InputValidation tried to use it but obviously couldn't. Validation of
absolute windows filepaths remains as broken as before.
 2011-03-28 18:27:01 +02:00
Günther Brammer 2031fb0644 Do not enumerate pointers before saving 
Instead, retrieve the number on demand during serialization. This saves
lots of unnecessary code and makes serialization actually not modify the
objects. At least with the exception of nInfo, but that should be save.
 2011-03-28 00:15:06 +02:00
Günther Brammer 8a17593c99 Fix StdMeshInstance deserialization 
The BitfieldAdapt had a builtin default of 0 for serialization, so it needs
that default when deserializing. Also remove that builtin default.

When AnimationNodes were loaded out of order, some of them were thrown away
when their vector was shortened. Don't shorten the vector during load.
 2011-03-31 01:25:27 +02:00
Günther Brammer f582a97998 Add C4ValueNumbers helper class and pass it through to C4Value::CompileFunc 
In preparation of using that class to enumerate and denumerate various
pointers.
 2011-03-26 23:59:35 +01:00
Sven Eberhardt 269c7b208c control config dialog 2011-03-30 22:11:47 +02:00
Julius Michaelis 7827f60775 Fix 3f4fcad06cfd 2011-03-21 23:26:21 +01:00
Julius Michaelis 9e1bff2e17 Save IRC clients joined channels 2011-03-21 22:39:36 +01:00
Günther Brammer 16538864f6 win32: Remove unused function C4Facet::Draw 2011-03-13 22:11:04 +01:00
Günther Brammer 6c2a89eaf8 Replace timeGetTime with a platformneutral GetTime wrapper 2011-03-13 17:25:35 +01:00
Armin Burgmeier 884809e8f2 Merge filename extension changes 2011-03-13 17:15:40 +01:00
Günther Brammer e56a5b0136 Correctly use the C4RGB macro 
C4RGB sets the alpha channel to 0xFF instead of 0x00 like RGB did.
 2011-03-13 17:09:47 +01:00
Armin Burgmeier 2a2408f9a8 Change .c4p extension to .ocp 2011-03-13 16:39:48 +01:00
Armin Burgmeier 41a1b5867d Change .c4g extension to .ocg 2011-03-13 16:16:45 +01:00
Günther Brammer c49f8b32d5 win32: wrap all windows.h-includes to always undef troubling macros 2011-03-13 15:48:45 +01:00
Günther Brammer 506466ef2e Remove the jpeglib.h versus windows.h/rpcndr.h boolean workaround 2011-03-11 14:37:51 +01:00
Günther Brammer 62bcf4d5c2 win32: move StdStrBuf(const wchar_t*) to StdBuf.cpp to avoid winnls.h 2011-03-12 15:26:35 +01:00
Armin Burgmeier 52c2227cef Merge 2011-03-12 14:12:14 +01:00
Armin Burgmeier fd2b981547 Backed out changeset: b019ea52537e 
Breaks build with more recent jpeglib such as used by nightly builds
 2011-03-12 14:12:04 +01:00
Günther Brammer 81d64df737 Do not use Windows' RGB macros for BGR colors 2011-03-11 03:37:27 +01:00
Julius Michaelis 0d804cad50 Workaround a jpeglib 6b weirdness 2011-03-09 00:01:27 +01:00
Günther Brammer 01e9dce9ce Store C4ComponentHost filenames in StdCopyStrBufs 2011-03-05 02:45:27 +01:00
Nicolas Hake 0800b3a209 StdBuf: change member order to silence g++ warnings 2011-03-04 00:02:43 +01:00
Günther Brammer 45620c2b85 Move some C4AulDebug code into C4AulDebug 2011-03-03 00:58:43 +01:00
Günther Brammer e250312c26 Move C4DefList class into from C4Def.cpp/h to new C4DefList.cpp/h 2011-03-03 17:10:22 +01:00
Julius Michaelis 530a70f43c Create a log file for each instance of clonk on UNIXes (cmake only) 2011-03-02 18:54:28 +01:00
Günther Brammer d0ef0866d7 Flush stdout after every log line even without a terminal 2011-02-04 00:15:52 +01:00
Günther Brammer 5151177d44 Move some BMP-loading helpers to C4Landscape.cpp 2011-01-19 23:52:46 +01:00
Günther Brammer 83322f596a Move Mesh loaders from src/platform to src/lib 
They are entirely platform-independent.
 2011-01-19 22:55:18 +01:00
Armin Burgmeier 9f74506e9b Support loading game data from system path 2011-01-06 21:18:13 +01:00
Nicolas Hake b05f539641 Remove Rnd3()/Randomize3() 
These functions didn't serve any purpose that wouldn't be also provided by the standard network-safe
RNG. Accordingly, they have been removed.
This patch also removes some apparently superfluous calls to Rnd3 that ignored the returned value.
 2011-01-02 04:05:21 +01:00
Armin Burgmeier bf00eb276f Don't reset progress bar when starting to load definitions 2010-12-29 17:00:13 +01:00
Julius Michaelis eb6d3db1f4 Log to record file, too, when recording 2010-12-25 16:00:59 +01:00
Günther Brammer be342d4a51 copyright notices update 2010 
This time with more manual checking and using git blame -M -C, so that
a few cases of copied code get a copyright notice corresponding to
their initial introduction.
 2010-12-23 01:01:24 +01:00
Peter Wortmann 0c8bac0140 StdCompiler: Removed "compatibility" hack to have RCT_Escaped fallback to RCT_All. 
RCT_Escaped is meant to be used when embedding a string into a custom encoding of a structure. That's why it has a terminator symbol and escapes anything that could be interpreted as a seperator. Falling back to RCT_All completely destroys this safeness, as it just blindly copies everything. In case this kind of functionality is really needed, introduce RCT_EscapedAll or something similar.
 2010-12-19 01:43:40 +00:00
Günther Brammer 5bb3e81f4f Physical: Remove Magic and associated other Magic 2010-12-12 01:25:58 +01:00
Günther Brammer c16102ec9b Shrink StdBuf from 24 to 16 bytes and C4PropList from 56 to 48 on amd64 
There's no need for Buffers which exceed 4 GB size in Clonk. C4PropList
just had some padding for alignment.
 2010-12-06 19:04:32 +01:00
Günther Brammer 75c2b21ee8 GUI: Remove superfluous checks for pGUI 2010-10-30 01:47:50 +02:00
Günther Brammer b946751f36 Fix problems found by z33ky with g++ 4.6 2010-11-25 15:24:49 +01:00
Günther Brammer 9494b90fe8 win32: Copy, paste and type arbitrary Unicode characters 2010-11-04 02:08:02 +01:00
Tobias Zwick e0cb527c5d removed Score.png from resources 2010-10-03 14:31:26 +02:00
Nicolas Hake d05a5ec9f5 msvc: Build fix 2010-09-24 20:38:02 +02:00
Günther Brammer 5dc10647e2 C4TargetFacet now also stores the Zoom factor 2010-09-24 20:17:07 +02:00
Sven Eberhardt 6512340382 Pass previous ActionTarget/ActionTarget2 to AbortCalls 2010-07-30 19:42:54 +02:00
Günther Brammer d372200c38 Fix windows-1252->utf-8 conversion 
This got broken by 87f868b2aff0. Unfortunately, the big
reformat-everything commit since then makes it too much
work to revert that commit.
 2010-07-20 18:41:50 +02:00
Günther Brammer 9bae376055 Remove old style Cursor and other dead code 2010-07-06 02:10:54 +02:00
Günther Brammer e109df627c Remove a lot of old obsolete palette code 
Hardcode the few remaining palette references instead. We might want to
include some method to customize some colors again, but not for debug
display and such things.
 2010-06-29 01:02:16 +02:00
Günther Brammer 9a4c56fc10 More startup simplification 2010-06-29 01:02:14 +02:00
Günther Brammer 623cb9476c Fix scenario local Graphics.c4g 2010-06-29 01:02:14 +02:00
Günther Brammer 46aa12def4 Merge C4GUI::Resource into C4GraphicsResource 
Both classes did the same thing at the same time, with the only difference
that C4GUI::Resource was vaguely more associated with GUI stuff. Some
time ago, C4GUI::Resource could be freed during the game, but not anymore.

This saves some lines of code and one redundant class, but shouldn't change
anything besides progress bar being textured a little earlier during
startup.
 2010-06-27 02:42:48 +02:00
Günther Brammer c0ce4d613b Make the startup progress bar more accurate 
This should also simplify the startup code a bit. Not enough,
but it's a start.
 2010-06-27 02:42:48 +02:00
Günther Brammer db6f4f502a Remove GDI font renderer, simplify font loader 
Instead of having a list of fonts, simply look up the font file if
necessary, and cache the freetype library state for one font.
 2010-06-27 02:30:47 +02:00
Günther Brammer 08b4858bd9 Fonts: Move the FontLoader into the global namespace 
This speeds up recompilation when C4Fonts.h changes.
 2010-06-27 02:21:23 +02:00
Sven Eberhardt 470e6043a2 WIN32 warning fix 2010-06-22 22:19:31 +02:00
Günther Brammer e80a39dd09 Remove some dead code 2011-03-09 23:30:23 +01:00
Nicolas Hake 59f5ee646c C4Real: Rename FIXEDnnn functions to C4REALnnn 2010-05-19 05:19:49 +02:00
Nicolas Hake e27ecd59b5 Rename FIXED to C4Real 
There's already a typedef struct _FIXED FIXED; in wingdi.h, which conflicts
with the definition of FIXED in OpenClonk.
 2010-05-04 17:35:18 +02:00
Günther Brammer e8be520da5 Make StdBuf compile with g++ 4.5 
This time without falling into the trap of ommitting the Foo(const Foo&) constructor.
 2010-04-27 01:20:30 +02:00
Nicolas Hake 45a1acac6c merge backed-out changeset 2010-04-26 16:32:46 +02:00
Nicolas Hake 00e1298927 Backed out changeset 9384f37fca80 
Re-breaking g++ 4.5, but at the same time un-breaking g++ 4.3, as well
as MSVC 2010 (Beta 2, at least). Sorry, g++ 4.5 users.

This wouldn't have happened with std::string.
 2010-04-26 16:32:10 +02:00
Günther Brammer e852c15944 Make StdBuf compile with g++ 4.5 2010-04-25 14:29:01 +02:00
Günther Brammer 3342509880 Fix a potential infinite loop in the landscape.txt interpreter 2010-04-25 14:27:06 +02:00
Nicolas Hake 46ece7030e Use <cmath> M_PI instead of own "pi" constant 
This solves a conflict with a definition with the same name within Apple SDK
headers (thanks, Mortimer)
 2010-04-24 17:40:41 +02:00
Nicolas Hake 9d672997bf Work around jpeglib weirdness 2010-04-24 14:35:37 +02:00
Armin Burgmeier c6ca0bb2d8 Make sure to use same boolean size in Clonk and libjpeg 2010-04-23 20:50:15 +02:00
Sven Eberhardt 6158aec581 Removed internal score counting by player wealth/owned objects 
Unified and renamed all Points/Value/Score functions/field names into Score
Some MSVC warning fixes
 2010-04-21 21:12:49 +02:00
Nicolas Hake 5dc0d3b4cb Reduce value truncation warnings 2010-04-20 18:20:24 +02:00
Armin Burgmeier a17bc1536e Add CMake check for HAVE_BOOLEAN 2010-04-18 23:12:49 +02:00
Armin Burgmeier 70ac17c040 Mingw64 build fixes 2010-04-18 22:02:01 +02:00
Armin Burgmeier 94389f3940 Fix build with MSVC 2010-04-02 15:15:58 +02:00
Armin Burgmeier c2924041c9 Fix seperate->separate everywhere 2010-04-01 23:08:06 +02:00
Armin Burgmeier 79d2c869ed Add StdContextPtrAdapt and make StdPtrAdapt work with StdParameterAdapt 2010-04-01 22:45:02 +02:00
Benjamin Herr 5cdbd907c8 Make some src/lib headers compile on their own 2010-03-29 01:58:02 +02:00
Benjamin Herr 4378de147c Rerun astyle with missing \ added 2010-03-28 20:58:01 +02:00
Benjamin Herr 27287b981f Reformat everything according to style guidelines 
as per http://forum.openclonk.org/topic_show.pl?tid=208
and http://wiki.openclonk.org/w/Style_Guidelines
via astyle
  --brackets=break
  --indent=tab=2
  --keep-one-line-statements
  --keep-one-line-blocks
  --indent-namespaces
  --convert-tabs
  --recursive
  --exclude=zlib
  --exclude=tinyxml
  src/\*.h src/*.cpp
 2010-03-28 19:58:21 +02:00
Günther Brammer b4e37b070b Change all indentation with spaces to use tabs instead 
This is a whitespace-only patch. Hopefully, it'll only affect rarely-changed
parts of the engine, since all regularly maintained pieces should already
use tabs.
 2010-03-27 17:05:02 +01:00
Sven Eberhardt f32a4547e3 fix edit cursor highlight on zoomed object (#176) 
MSVC assertion fix
 2010-03-25 20:57:08 +01:00
Armin Burgmeier 80dd059338 Fix graphics skips of sprite picture overlays when zooming or moving viewport 2010-03-25 15:39:15 +01:00
Günther Brammer 2a99ad1d39 Split Standard.h into two: Miscellanous utility and platform abstraction 2010-03-08 23:59:11 +01:00
Armin Burgmeier 084992a605 Correctly round FIXED -0.5 to -1 2010-03-18 15:23:03 +01:00
Günther Brammer ed66b27cf3 Finally move the Log() declaration where it belongs 
In the old days, the code was split in two parts - C4* files in one part
and the other files. Long, long ago, the other files were presumably used
by other programs, but that wasn't true since the GWE at least. But the
split was maintained, except for the Log functions. Now that everything
is one giant bunch anyway, the Log functions can be declared in C4Log.h
again.
 2010-03-04 22:16:55 +01:00
Günther Brammer e30ff99d6a Remove all superflous #include <Standard.h> 
Standard.h is included by C4Include.h, and every file includes that.
 2010-03-04 22:11:12 +01:00
Sven Eberhardt 8f83d4853e fix additional def graphics name and zoom (#100) 2010-02-28 14:35:48 +01:00
Nicolas Hake 0b137e8cd5 msvc: Build fixes for x64 compatibility 
I don't know whether it works, because I don't have 64 bit libraries at the
moment. But at least the syntax errors are gone.
 2010-02-27 14:48:01 +01:00
Martin Plicht 2bb528b5d4 Define NOAULDEBUG to compile without C4AulDebug 2010-02-23 19:29:26 +01:00
Martin Plicht 8e1390c92e debug branch brought up to date 2010-02-19 15:54:31 +01:00
Günther Brammer ff8d950e85 Remove C4ENGINE define 
Most files using it weren't used by c4group-the-application anymore, and
the remaining stuff can be dealt with by using stubs or the same code in
both cases.
 2010-02-17 22:59:46 +01:00
Günther Brammer a16df97a95 Various cleanups in the platform code 2010-02-16 02:54:02 +01:00
Martin Plicht cf382f34ce Merge, resolving C4NetIO conflict 2010-02-03 03:39:21 +01:00
Nicolas Hake b2c87a636e Smart search for scaled facets 2010-02-02 14:39:58 +01:00
Sven Eberhardt bfe0baa299 fix a few memleaks+unnecessary reinitializations of fonts 2010-01-26 22:47:40 +01:00
Benjamin Herr f3b35227ea avoid lots of gcc warnings 2010-01-25 05:00:59 +01:00
Nicolas Hake 583f8e9799 Add deprecation macro 2010-01-25 04:14:53 +01:00
Nicolas Hake b1f0c3e1c6 Remove a49cc8f3de41 and add more solid fix 2010-01-24 02:48:55 +01:00
Martin Plicht f1b615e7ec Merge default into debug 2010-01-13 18:07:58 +01:00
Nicolas Hake d6c50df936 Revive ssize_t definition for non-GNU targets 2010-01-04 03:18:28 +01:00
Armin Burgmeier fb95c3af2e Merge mesh into default 2010-01-04 01:10:31 +01:00
Günther Brammer e592ca643c Move prototypes back to C4Prototypes.h 2010-01-02 01:19:42 +01:00
Günther Brammer d4cb25cf39 Reorganize C4Include.h and Standard.h 
All plattform stuff is now in Standard.h, while C4Include.h just includes
a bunch of headers. Mostly headers from the standard library, because
those change very seldom.

Also remove the ptrdiff_t typedef, properly include <cstddef> instead.
 2010-01-02 01:11:54 +01:00
Nicolas Hake 07cd8b696c C4RTF: Accomodate case sensitive file systems 2009-12-31 04:00:04 +01:00
Nicolas Hake 48986e9050 Rename C4RTF.h as well 2009-12-30 20:49:15 +01:00
Tobias Zwick edec15d64f merge 2009-11-30 17:24:14 +01:00
mizipzor a53dae0c1b Fixed compilation in MSVC2010 2009-11-25 19:38:54 +01:00
Nicolas Hake 55c86b2001 MSVC: Re-enable deprecation warnings 
The reason those were disabled have been warnings about not using MSVC's
"secure" CRT functions and non-standard-C POSIX functions. Those warnings
have been disabled selectively by command line macro definitions.
 2009-11-12 14:14:08 +01:00
Nicolas Hake 4bda27997c win32: Allow windowed mode 
Frontend dialogs aren't resized since they would have to be destroyed
and re-created in the current implementation; this should change to an
auto-layouter as in other widget toolkits.
This is an OS independent problem though.
 2009-10-23 03:53:16 +02:00
Armin Burgmeier 49e607bab0 Added includes and forward declarations, fixing the build 2009-10-26 00:09:34 +01:00
Nicolas Hake 52bde5a579 Remove BIG_C4INCLUDE define 2009-10-20 06:21:12 +02:00
Nicolas Hake f0fdf5e992 Prepare for precompiled headers 2009-10-20 05:39:24 +02:00
Tobias Zwick 1537104306 Removed parts of the old HUD, minor fixes: 
+ removed the Captain/GetCaptain/rendering
+ removed energy bars
+ added the possibility for the crew selector to display different ranks for different clonk types
+ fixed GetCrewSelected
 2009-10-13 16:02:13 +02:00
Tobias Zwick f584896446 merge 2009-10-08 20:51:31 +02:00
Peter Wortmann 7ed1264518 Optimize rotated solid masks some more 2009-09-19 23:20:32 +02:00
Armin Burgmeier 778ec7278f Merged default into mesh 2009-09-19 13:13:10 -04:00
Armin Burgmeier 809c2234cd Merged alphafix into default 
This reverts the meaning of alpha components everywhere in engine and script.
alpha=0 means transparent, and alpha=255 means opaque.
 2009-09-19 12:08:09 -04:00
Günther Brammer dddf9ef00a Change all lineendings to LF (except in planet/) 2009-09-16 03:29:20 +02:00
David Dormagen a886a18180 replaced remaining TRUE and FALSE (both are invalid now) 2009-09-05 19:22:54 +02:00
Armin Burgmeier de00b5df53 Moved StdMesh headers to correct location, load meshes without skeleton 2009-08-27 22:41:23 -04:00
Armin Burgmeier 0137936211 Merged alphafix into mesh 2009-08-27 21:52:10 -04:00
Armin Burgmeier 4fa029df2c Merged default into mesh 2009-08-27 21:35:55 -04:00
Armin Burgmeier 4573315d42 Reverted meaning of alpha: Now 255 is opaque and 0 is transparent 
Shader and D3D remains to be adapted yet.
 2009-08-23 17:46:56 -04:00
Günther Brammer 0254addc90 Fix DebugRec 2009-08-25 17:50:51 +02:00
Günther Brammer 9a8b5dd739 Replace BOOL by bool, TRUE by true, FALSE by false 2009-08-15 20:50:32 +02:00
Günther Brammer a28a6621da shuffle the #includes around a bit 
This reduces the dependencies from src/lib to the rest of the code a bit.
 2009-08-12 22:03:50 +02:00
Günther Brammer b46f4696e9 Split C4Rect out to its own source file 
Because much more depends on C4Rect than only C4Shape, and C4Shape uses
lots of other stuff.

Also move some other files which depend on C4Group to src/c4group, because
I'm editing the build files anyway.
 2009-08-14 01:46:32 +02:00
Sven Eberhardt df6010a148 merge 2009-08-12 17:27:43 +02:00
Günther Brammer 572d00c32e Move all source files 
This might make stuff easier to find.
 2009-08-10 17:59:18 +02:00