Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed some merge issues and windows compilation

  • Loading branch information...
commit d06a286199c6ab0b5f781ed52de7e5616f317771 1 parent 4537296
@fador authored
View
2  include/constants_num.h
@@ -186,5 +186,5 @@ enum Dye
};
// get block names.
-extern std::string GetBlockName(Block);

I guess it would help if I included the file that did that haha

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
+//extern std::string GetBlockName(Block);
#endif
View
2  include/plugin.h
@@ -64,7 +64,7 @@
#define LIBRARY_LOAD(x) LoadLibrary(x)
#define LIBRARY_SELF() GetModuleHandle(NULL)
#define LIBRARY_SYMBOL(x, y) GetProcAddress(x, y)
-char *LIBRARY_ERROR(void)
+static char *LIBRARY_ERROR(void)
{
char errbuf[513];
DWORD err = GetLastError();
View
3  src/blocks/falling.cpp
@@ -25,6 +25,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <stdio.h>
#include "mineserver.h"
#include "map.h"
#include "plugin.h"
@@ -205,7 +206,7 @@ void BlockFalling::applyPhysics(User* user, int32_t x, int8_t y, int32_t z, int
{
if(ServerInstance->plugin()->getBlockCB()[i]->affectedBlock(neighbour))
{
- LOG(INFO, "Gravity", printfify("Falling block %s (x=%i, y=%i, z=%i)", GetBlockName(static_cast<Block>(neighbour)).c_str(), x, y, z));
+ //LOG(INFO, "Gravity", printfify("Falling block %s (x=%i, y=%i, z=%i)", GetBlockName(static_cast<Block>(neighbour)).c_str(), x, y, z));
uint8_t neighbor, neighbormeta;
while(ServerInstance->map(map)->getBlock(++x,y,z, &neighbor, &neighbormeta) && affectedBlock(neighbor))
View
2  src/blocks/falling.h
@@ -40,7 +40,7 @@
class BlockFalling: public BlockBasic
{
public:
- inline bool affectedBlock(int block) const;
+ bool affectedBlock(int block) const;
void onNeighbourBroken(User* user, int16_t oldblock, int32_t x, int8_t y, int32_t z, int map, int8_t direction);
bool onPlace(User* user, int16_t newblock, int32_t x, int8_t y, int32_t z, int map, int8_t direction);
void onNeighbourMove(User* user, int16_t newblock, int32_t x, int8_t y, int32_t z, int8_t direction, int map);
View
4 src/signalhandler.cpp
@@ -103,7 +103,7 @@ void HandleSegfault()
std::cout.flush(); //Clear output
#endif // HAVE_BACKTRACE
- Mineserver::get()->stop();
+ ServerInstance->stop();
exit(SIGSEGV); // Exit so we're not still running
}
@@ -140,7 +140,7 @@ void SignalHandler(int sig)
signal(SIGHUP, SIG_IGN);
#endif
LOG2(INFO, "Received SIGTERM, Exiting..");
- Mineserver::get()->stop();
+ ServerInstance->stop();
break;
default:
static_cast<void>(0); // TODO: fix this to do something useful?
Please sign in to comment.
Something went wrong with that request. Please try again.