Skip to content

Commit

Permalink
Replaced all instances of DLList with std::list
Browse files Browse the repository at this point in the history
Replaced many pointer parameters with reference parameters
Fixed an initialization bug in HTTPServer
Updated Jupiter
  • Loading branch information
JAJames committed Feb 14, 2017
1 parent 16b6ae2 commit 5ebf36f
Show file tree
Hide file tree
Showing 55 changed files with 1,759 additions and 1,776 deletions.
2 changes: 1 addition & 1 deletion Bot/Main.cpp
Expand Up @@ -104,7 +104,7 @@ int main(int argc, const char **args)
SetConsoleOutputCP(65001);
#endif // _WIN32

srand(static_cast<unsigned int>(std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count()));
srand(static_cast<unsigned int>(std::chrono::system_clock::now().time_since_epoch().count()));
puts(Jupiter::copyright);
const char *configFileName = "Config.ini";

Expand Down
1 change: 0 additions & 1 deletion Configs/RenX.Commands.ini
Expand Up @@ -7,7 +7,6 @@
; StaffTitle=String (Default: Moderator)
;

[RenX.Commands]
TBanTime=86400

;EOF
6 changes: 3 additions & 3 deletions HTTPServer/HTTPServer.cpp
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2015-2016 Jessica James.
* Copyright (C) 2015-2017 Jessica James.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
Expand All @@ -20,9 +20,9 @@

using namespace Jupiter::literals;

HTTPServerPlugin::HTTPServerPlugin()
bool HTTPServerPlugin::initialize()
{
HTTPServerPlugin::server.bind(this->config.get("BindAddress"_jrs, "0.0.0.0"_jrs), this->config.get<uint16_t>("BindPort"_jrs, 80));
return HTTPServerPlugin::server.bind(this->config.get("BindAddress"_jrs, "0.0.0.0"_jrs), this->config.get<uint16_t>("BindPort"_jrs, 80));
}

int HTTPServerPlugin::think()
Expand Down
4 changes: 2 additions & 2 deletions HTTPServer/HTTPServer.h
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2015-2016 Jessica James.
* Copyright (C) 2015-2017 Jessica James.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
Expand Down Expand Up @@ -53,7 +53,7 @@
class HTTPSERVER_API HTTPServerPlugin : public Jupiter::Plugin
{
public:
HTTPServerPlugin();
virtual bool initialize() override;
Jupiter::HTTP::Server server;

public: // Jupiter::Plugin
Expand Down
2 changes: 1 addition & 1 deletion Jupiter
6 changes: 3 additions & 3 deletions RenX.AlwaysRecord/RenX_AlwaysRecord.cpp
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2015 Jessica James.
* Copyright (C) 2015-2017 Jessica James.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
Expand All @@ -21,9 +21,9 @@

using namespace Jupiter::literals;

void RenX_AlwaysRecord::RenX_OnMapStart(RenX::Server *server, const Jupiter::ReadableString &)
void RenX_AlwaysRecord::RenX_OnMapStart(RenX::Server &server, const Jupiter::ReadableString &)
{
server->send("demorec"_jrs);
server.send("demorec"_jrs);
}

// Plugin instantiation and entry point.
Expand Down
4 changes: 2 additions & 2 deletions RenX.AlwaysRecord/RenX_AlwaysRecord.h
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2015-2016 Jessica James.
* Copyright (C) 2015-2017 Jessica James.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
Expand All @@ -26,7 +26,7 @@
class RenX_AlwaysRecord : public RenX::Plugin
{
public: // RenX::Plugin
void RenX_OnMapStart(RenX::Server *server, const Jupiter::ReadableString &) override;
void RenX_OnMapStart(RenX::Server &server, const Jupiter::ReadableString &) override;
};

#endif // _RENX_ALWAYSRECORD_H_HEADER

0 comments on commit 5ebf36f

Please sign in to comment.