1
0
Commit Graph

35 Commits

Author SHA1 Message Date
Alex Sweet
a0896c63d7 Smelting Gives Experience (#4094)
* Smelting Exp

Smelting now gives experience

* Furnace.txt update

Exp rewards are entered in furnace.txt, Reward calculation is now done
is the furnaceentity class

* furnace.txt update

Changed alignment tabs to spaces
Included documentation of exp in recipe

* Updated StringToFloat

changed strtod to strtof

* Explicit Float to Int

* Reworked Smelting Rewards

* No C casts

-Adds new function to the api
-Sets reward counter to 0 in furnace constructor

* Style and exp lock removed

-Fixed  style mistakes accoring to PR notes
-XP isn't locked to a single player anymore

* No Smelter API

-Removed SetLastSmelter and GetLastSmelter
-Fixed comments
-Fixed log reward amounts
2018-04-11 07:46:11 +01:00
peterbell10
757231cc6e
Add the fmt library (#4065)
* Replaces AppendVPrintf with fmt::sprintf
* fmt::ArgList now used as a type safe alternative to varargs.
* Removed SIZE_T_FMT compatibility macros. fmt::sprintf is fully portable and supports %zu.
* Adds FLOG functions to log with fmt's native formatting style.
2018-01-03 17:41:16 +00:00
bibo38
532731e6f4 Fixed Clang 5.0 compile errors (#4085)
* Fixed Clang 5.0 compile errors

* Fixed wrong comment

* Only disable warnings in Clang 5 or higher

* Added a CMake condition for the Clang 5 no-zero-as-null-pointer-constant warning

* Now using the use_nullptr branch of the Cuberite specific SQLiteCpp fork
2017-12-21 11:36:58 +00:00
mathiascode
02775e52c4 Minor changes (#3909) 2017-08-24 11:19:40 +02:00
Tiger Wang
8c6d0b51c7 Use CMake's Android generators to crosscompile 2016-12-12 14:32:32 +00:00
LogicParrot
ca6ef58b1e Bulk clearing of whitespace 2016-02-05 23:50:18 +02:00
bibo38
0cb0bbe51a Changing the shared_ptr/unique_ptr constructors to the make_shared/make_unique functions 2015-07-12 21:02:47 +02:00
tycho
dae9e5792a Made -Weverything an error. 2015-05-24 12:56:56 +01:00
Howaner
8277e1ec4e C++11 and function rename. 2014-12-17 19:14:01 +01:00
Howaner
8591935a4b Implemented vanilla-like shift click.
This fixes many visual bugs.
2014-12-13 18:49:11 +01:00
Mattes D
186b2f3bd0 Replaced auto_ptr with unique_ptr. 2014-11-27 21:27:03 +01:00
Tiger Wang
a26541a7c3 En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Howaner
af125d2a61 Use std::auto_ptr 2014-08-31 22:04:52 +02:00
Howaner
0d392f53ed Fixed compile warnings. 2014-08-31 20:53:41 +02:00
Howaner
0beed83ae9 Rewrited furnace.txt loading. 2014-08-31 19:00:36 +02:00
madmaxoft
93d29555e5 Style: Normalized to no spaces before closing parenthesis. 2014-07-21 17:40:43 +02:00
madmaxoft
7fff12bfac Fixed spaces around single-line comments.
There should be at least two spaces in front and one space after //-style comments.
2014-07-17 19:13:23 +02:00
Mattes D
0df644c9f7 FurnaceRecipe parsing: Fixed whitespace removing. 2014-06-26 18:28:10 +02:00
Mattes D
ec1015112c Fixed misformed trimming. 2014-06-26 18:20:12 +02:00
Mattes D
55bbdfa5d4 FurnaceRecipe: Moved the parsing into separate functions for clarity. 2014-06-26 18:18:41 +02:00
Mattes D
67e3c645d3 FurnaceRecipe parser: Made the parser more forgiving.
Errors don't cause a stop in the parsing, but rather just skip the offending line.
2014-06-26 17:52:37 +02:00
Mattes D
b90b0a1dff FurnaceRecipe parser: Added an else branch, changed to a switch. 2014-06-26 17:51:19 +02:00
Mattes D
3216fbabfd Merge remote-tracking branch 'origin/furnaceparsing' 2014-06-26 17:11:40 +02:00
Tiger Wang
7a23692131 Parenthesised comparison 2014-06-23 17:40:51 +01:00
Tiger Wang
dc8817feee Merge remote-tracking branch 'origin/furnaceparsing' into furnaceparsing
Conflicts:
	src/FurnaceRecipe.cpp
2014-06-22 21:51:21 +01:00
Tiger Wang
c476fc3cf5 Suggestions 2014-06-22 21:49:37 +01:00
worktycho
63ce2e8b37 Fixed compile errors 2014-06-22 12:30:37 +01:00
Tiger Wang
4a01fba3aa Suggestions 2014-06-22 00:06:58 +01:00
Tiger Wang
537467fe25 Removed debugging code 2014-06-21 20:35:28 +01:00
Tiger Wang
a908f39dde Rewrote furnace recipe parser
* Fixes #110
2014-06-21 20:33:23 +01:00
archshift
e8143de01b Nullify deleted pointers. 2014-06-19 01:49:56 -07:00
jfhumann
013da806ec Did some static analysis, fixed some bugs and optimized a lot of code 2014-04-18 21:09:44 +02:00
Tycho
862e219443 Added additional macros to support the MSVC size_t format and changed all formats to use the macros 2014-03-12 10:34:50 -07:00
Tycho
16b27c4b7a Fixed a load of format string errors 2014-03-11 14:16:08 -07:00
Alexander Harkness
675b4aa878 Moved source to src 2013-11-24 14:19:41 +00:00