1
0
Commit Graph

52 Commits

Author SHA1 Message Date
Mattes D
271c8c0d32 More template keyword fixes. 2014-08-28 16:58:48 +03:00
Mattes D
64fec204c4 Added initializers for class members.
As reported by Coverity, these weren't initialized.
2014-08-21 22:39:53 +02:00
madmaxoft
2423fbf2ef Normalized comments.
This was mostly done automatically and then visually inspected for obvious errors.
All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
2014-07-17 22:15:34 +02:00
madmaxoft
993fd14ddf Fixed basic whitespace problems.
Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines.
2014-07-17 16:33:09 +02:00
Howaner
905fed09a6 Fixed wrong types. (BLOCKTYPE -> NIBBLETYPE) 2014-07-13 00:51:42 +02:00
archshift
e8143de01b Nullify deleted pointers. 2014-06-19 01:49:56 -07:00
madmaxoft
ec0976f9b0 Fixed a crash when creating negative-size blockareas.
Now the server emits a warning instead and continues execution.
2014-06-09 00:49:02 +02:00
madmaxoft
b7dc4177d0 cBlockArea reading hotfix.
This should fix the crashes introduced with chunksparsing. Not the most performant solution, but at least it should work.
Ref.: #1056
2014-06-02 14:07:36 +02:00
madmaxoft
f7777e8c75 Added comments, reformatted code. 2014-05-29 18:25:08 +02:00
Tycho
8f964886e0 Implemented style changes 2014-05-24 13:33:40 +01:00
Tycho
4ab8288116 Merge branch 'master' into chunksparsing/structs 2014-05-24 12:44:49 +01:00
Tycho
5929ffbc40 Fixed stylistic issues 2014-05-21 20:08:34 +01:00
Tycho
024027db89 Renamed cChunkBuffer to cChunkData 2014-05-21 19:58:48 +01:00
Tycho
cdd3d11496 Fixed minor style issues 2014-05-21 18:33:54 +01:00
archshift
6c57b38b74 Fixed a warning and a complaint about a never-read variable. 2014-05-11 13:44:30 -07:00
Tycho
d478e3cfb1 Merge branch 'master' into chunksparsing/structs
Conflicts:
	src/Chunk.h
2014-05-10 05:05:44 -07:00
Mattes D
fb58ef55be Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
madmaxoft
b69a0c914e Fixed a flipped condition in cBlockArea::Merge(). 2014-05-05 20:33:50 +02:00
Tycho
ec407dd27d Merge branch 'master' into chunksparsing/structs
Conflicts:
	src/Chunk.cpp
2014-05-03 06:07:56 -07:00
madmaxoft
a91129af4a Fixed warnings in cBlockArea. 2014-05-01 22:44:52 +02:00
Tycho
8780b324ff Merge branch 'master' into chunksparsing/structs 2014-05-01 11:50:40 -07:00
madmaxoft
709ae320e0 Disabled MSVC warnings about constant bool expressions. 2014-04-28 22:30:07 +02:00
Tycho
ad5cdf9f2d Removed static from combinators.
THis allows us to use the functions in template params at the cost of polluting the global namespace.
2014-04-28 11:07:06 -07:00
Tycho
6d520e398b Fixed unbraced ifs 2014-04-28 11:00:43 -07:00
Tycho
05fe6d6c58 Removed inlines from combinators
gcc requires external linkage for functions provided to template parameters
2014-04-28 10:52:48 -07:00
Tycho
a42480cf82 Template Magic
Removed need to allocate a fake meta block by using templates to provide a version
of the code that does not use metas. Also changed the function to a template
argument to make sure that the compilier is able to inline it.
2014-04-28 10:31:07 -07:00
Tycho
744e00c904 Worked around const pointer 2014-04-27 13:43:59 -07:00
Tycho
a2b1fa6520 Initialised MetaArrays in BlockArea
Fixes CID 43621
2014-04-27 13:12:36 -07:00
Tycho
6f1fea759e Fixed bad comment 2014-04-27 08:14:56 -07:00
Tycho
e40f9d6e5b Implemented Chunk Sparsing with segments 2014-04-26 10:50:23 -07:00
Mattes D
25529ba62f Fixed a few MSVC type warnings. 2014-04-03 09:27:17 +02:00
madmaxoft
e7e65b5005 Merged branch 'msDifference'. 2014-04-01 21:21:11 +02:00
madmaxoft
1229795ff0 cBlockArea: Added the msMask merge strategy. 2014-04-01 20:50:10 +02:00
STRWarrior
c4e07631c8 Added new merge strategy "msDifference" 2014-03-31 19:47:18 +02:00
madmaxoft
8557549cfa Implemented the msSpongePrint merge strategy.
Similar to msImprint, but allows prefabs to carve out air pockets, too. The sponge block is used as the NOP block.
2014-03-28 18:03:37 +01:00
madmaxoft
87de596078 BlockArea: Create() can take the size as Vector3i, too. 2014-03-25 22:05:45 +01:00
madmaxoft
87e0bd54b4 BlockArea: Switched internal coords to Vector3i. 2014-03-25 21:59:41 +01:00
madmaxoft
950614da7e Renamed cBlockArea Offset to WEOffset.
Even in getters / setters.
2014-03-12 07:46:14 +01:00
STRWarrior
e213e5f9fc Renamed m_Offset to m_WEOffset 2014-03-11 18:23:21 +01:00
STRWarrior
541175d8a0 Using ``const Vector3i &`` 2014-03-11 14:44:21 +01:00
STRWarrior
0cce0478d8 This allows a blockarea to have an Offset. 2014-03-10 17:07:46 +01:00
madmaxoft
9ab766189d Added useful parameter overloads to cBlockArea Lua API. 2014-02-24 23:17:12 +01:00
madmaxoft
0aa8f765f9 Fixed crash in cBlockArea rotation.
Fixes #720.
2014-02-24 09:34:37 +01:00
Tycho
4f09e8df6e Moved Schematic file methods to seperate class 2014-01-20 09:59:12 -08:00
Tycho
9bb61e6e2e Seperated BlockArea From World
If anyone can come up with a better name for the interface I'll change it, It contians to methods which do compleatly unrelated things
2014-01-20 09:17:24 -08:00
madmaxoft
934b90c121 Fixed a few MSVC warnings. 2014-01-07 14:24:25 +01:00
Tycho Bickerstaff
25d42c44d5 fixed warnings in BlockArea.cpp 2013-12-31 09:16:40 +01:00
madmaxoft
5689c00131 cBlockArea: Fixed writing full-height areas. 2013-12-26 10:59:01 +01:00
madmaxoft
c2befd9777 Fixed block area height check.
The block area couldn't be read up to chunk height.
2013-12-25 19:39:07 +01:00
madmaxoft
fc97cb8c58 Fixed a typo in cBlockArea merging code. 2013-12-20 16:48:45 +01:00