MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cxxrandom: remove pragmas, fix format warnings, misc. cleanup

develop
lethosor 2018-06-21 11:46:23 -04:00
parent 7a5e7c7c86
commit d9917e9a1d
1 changed files with 6 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
plugins/cxxrandom.cpp
Unescape Escape View File

@ -21,6 +21,7 @@ Updated: Dec. 21 2017
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
#include <cstdint> #include <cstdint>
#include <cinttypes>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -30,38 +31,15 @@ Updated: Dec. 21 2017
#include <Console.h> #include <Console.h>
#include <Export.h> #include <Export.h>
#include <PluginManager.h> #include <PluginManager.h>
/*
typedef unsigned short uint16_t;
typedef unsigned long long uint64_t;
typedef long long int64_t;
using uint16_t = unsigned short;
using uint64_t = unsigned long long;
using int64_t = long long;*/
using namespace DFHack; using namespace DFHack;
DFHACK_PLUGIN("cxxrandom"); DFHACK_PLUGIN("cxxrandom");
#define PLUGIN_VERSION 2.0 #define PLUGIN_VERSION 2.0
color_ostream *cout = nullptr; color_ostream *cout = nullptr;
//command_result cxxrandom (color_ostream &out, std::vector <std::string> & parameters);
DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands) DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands)
{ {
cout = &out; cout = &out;
/*
commands.push_back(PluginCommand(
"cxxrandom", "C++xx Random Numbers", cxxrandom, false,
" This plugin cannot be used on the commandline.\n"
" Import into a lua script to have access to exported RNG functions:\n"
" local rng = require('plugins.cxxrandom')\n\n"
" Exported Functions:\n"
" rng.ResetIndexRolls(string_ref, total_indices)\n"
" rng.RollIndex(string_ref, total_indices)\n"
" rng.RollInt(min, max)\n"
" rng.RollDouble(min, max)\n"
" rng.RollNormal(mean, std_deviation)\n"
" rng.RollBool(chance_of_true)\n"
" rng.BlastDistributions()\n\n"
));*/
return CR_OK; return CR_OK;
} }
@ -75,7 +53,6 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
return CR_OK; return CR_OK;
} }
#pragma region "EnginesKeeper Stuff"
class EnginesKeeper class EnginesKeeper
{ {
@ -111,9 +88,6 @@ public:
} }
}; };
#pragma endregion
#pragma region "EngineKeeper Wrappers"
uint16_t GenerateEngine( uint64_t seed ) uint16_t GenerateEngine( uint64_t seed )
{ {
@ -130,9 +104,6 @@ void NewSeed( uint16_t id, uint64_t seed )
EnginesKeeper::Instance().NewSeed( id, seed ); EnginesKeeper::Instance().NewSeed( id, seed );
} }
#pragma endregion
#pragma region "std Distribution Rollers"
int rollInt(uint16_t id, int min, int max) int rollInt(uint16_t id, int min, int max)
{ {
@ -158,9 +129,6 @@ bool rollBool(uint16_t id, float p)
return ND(EnginesKeeper::Instance().RNG(id)); return ND(EnginesKeeper::Instance().RNG(id));
} }
#pragma endregion
#pragma region "Number Sequence Stuff"
class NumberSequence class NumberSequence
{ {
@ -196,10 +164,10 @@ public:
char buffer2[256] = {0}; char buffer2[256] = {0};
for( auto v : m_numbers ) for( auto v : m_numbers )
{ {
sprintf( buffer2, "%s%d", buffer1, v ); sprintf( buffer2, "%s%" PRId64, buffer1, v );
sprintf( buffer1, "%s ", buffer2 ); sprintf( buffer1, "%s ", buffer2 );
} }
cout->print( buffer1 ); cout->print( "%s", buffer1 );
} }
}; };
@ -252,9 +220,6 @@ public:
} }
}; };
#pragma endregion
#pragma region "Sequence Wrappers"
uint16_t MakeNumSequence( int64_t start, int64_t end ) uint16_t MakeNumSequence( int64_t start, int64_t end )
{ {
@ -290,7 +255,6 @@ void DebugSequence( uint16_t id )
SequenceKeeper::Instance().PrintSequence( id ); SequenceKeeper::Instance().PrintSequence( id );
} }
#pragma endregion
DFHACK_PLUGIN_LUA_FUNCTIONS { DFHACK_PLUGIN_LUA_FUNCTIONS {
DFHACK_LUA_FUNCTION(GenerateEngine), DFHACK_LUA_FUNCTION(GenerateEngine),
@ -308,4 +272,3 @@ DFHACK_PLUGIN_LUA_FUNCTIONS {
DFHACK_LUA_FUNCTION(DebugSequence), DFHACK_LUA_FUNCTION(DebugSequence),
DFHACK_LUA_END DFHACK_LUA_END
}; };