Ratstail91/Tortuga
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Kayne Ruse
2015-05-17 12:38:44 +10:00
parent 102ba18b7b 164a3e18d9
commit 822d0636cc
42 changed files with 61 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+5 -3
View File
@@ -6,7 +6,8 @@ This game is inspired by classic 2D RPGs (Final Fantasy, The Legend of Zelda), a
## Releases
The most recent stable build for Windows can be found [here](https://dl.dropboxusercontent.com/u/46669050/Tortuga.rar).
* The most recent stable build for Windows can be found [here](https://dl.dropboxusercontent.com/u/46669050/Tortuga-win.rar).
* The most recent stable build for Linux can be found [here](https://dl.dropboxusercontent.com/u/46669050/Tortuga-linux.tar).
## Documentation
@@ -16,13 +17,14 @@ The most recent stable build for Windows can be found [here](https://dl.dropboxu
## External Dependencies
* [SDL 1.2](http://www.libsdl.org/) - Simple DirectMedia Layer API
* [SDL_net 1.2](http://www.libsdl.org/projects/SDL_net/) - SDL's networking extension
* [SDL_net 2.0](http://www.libsdl.org/projects/SDL_net/) - SDL's networking extension
* [lua 5.2](http://www.lua.org/) - The lua programming language
* [SQLite3](http://www.sqlite.org/) - A lightweight SQL database engine
## Tools
* [WinRAR](http://www.rarlab.com/) - The best compression tool available IMO; only needed for distribution
* [WinRAR](http://www.rarlab.com/) - The best compression tool available IMO; only needed for Windows distribution
* [Dropbox](https://www.dropbox.com/) - For hosting and distribution
## Copyright
client/client_application.cpp
+4 -1
View File
@@ -27,6 +27,7 @@
#include <stdexcept>
#include <chrono>
#include <iostream>
#include <sstream>
//-------------------------
//Scene headers
@@ -57,7 +58,9 @@ void ClientApplication::Init(int argc, char* argv[]) {
//initialize SDL
if (SDL_Init(SDL_INIT_VIDEO)) {
throw(std::runtime_error("Failed to initialize SDL"));
std::ostringstream os;
os << "Failed to initialize SDL: " << SDL_GetError();
throw(std::runtime_error(os.str()));
}
std::cout << "Initialized SDL" << std::endl;
client/client_utilities/makefile
-5
View File
@@ -30,8 +30,3 @@ $(OUTDIR):
$(OBJDIR)/%.o: %.cpp
$(CXX) $(CXXFLAGS) -c -o $@ $<
clean:
$(RM) *.o *.a *.exe
rebuild: clean all
client/entities/makefile
-5
View File
@@ -30,8 +30,3 @@ $(OUTDIR):
$(OBJDIR)/%.o: %.cpp
$(CXX) $(CXXFLAGS) -c -o $@ $<
clean:
$(RM) *.o *.a *.exe
rebuild: clean all
client/gameplay_scenes/makefile
-5
View File
@@ -30,8 +30,3 @@ $(OUTDIR):
$(OBJDIR)/%.o: %.cpp
$(CXX) $(CXXFLAGS) -c -o $@ $<
clean:
$(RM) *.o *.a *.exe
rebuild: clean all
client/gameplay_scenes/world_characters.cpp
+1
View File
@@ -23,6 +23,7 @@
#include "channels.hpp"
#include <cstring>
#include <iostream>
#include <sstream>
#include <stdexcept>
client/gameplay_scenes/world_logic.cpp
+2 -1
View File
@@ -22,11 +22,12 @@
#include "world.hpp"
#include "channels.hpp"
#include "terminal_error.hpp"
#include <stdexcept>
#include <algorithm>
#include <cmath>
#include <cstring>
#include <iostream>
#include <sstream>
client/makefile
+7 -1
View File
@@ -1,5 +1,5 @@
#include directories
INCLUDES+=. client_utilities entities gameplay_scenes menu_scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet_types ../common/ui ../common/utilities
INCLUDES+=SDL . client_utilities entities gameplay_scenes menu_scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet_types ../common/ui ../common/utilities
#libraries
#the order of the $(LIBS) is important, at least for MinGW
@@ -45,6 +45,12 @@ $(OBJDIR)/%.o: %.cpp
$(CXX) $(CXXFLAGS) -c -o $@ $<
clean:
ifeq ($(OS),Windows_NT)
$(RM) *.o *.a *.exe
else ifeq ($(shell uname), Linux)
find . -type f -name *.o -exec rm -f -r -v {} \;
find . -type f -name *.a -exec rm -f -r -v {} \;
rm -f -v out/client out/server
endif
rebuild: clean all
client/menu_scenes/makefile
-5
View File
@@ -30,8 +30,3 @@ $(OUTDIR):
$(OBJDIR)/%.o: %.cpp
$(CXX) $(CXXFLAGS) -c -o $@ $<
clean:
$(RM) *.o *.a *.exe
rebuild: clean all
common/debugging/makefile
-5
View File
@@ -30,8 +30,3 @@ $(OUTDIR):
$(OBJDIR)/%.o: %.cpp
$(CXX) $(CXXFLAGS) -c -o $@ $<
clean:
$(RM) *.o *.a *.exe
rebuild: clean all
common/gameplay/makefile
-5
View File
@@ -30,8 +30,3 @@ $(OUTDIR):
$(OBJDIR)/%.o: %.cpp
$(CXX) $(CXXFLAGS) -c -o $@ $<
clean:
$(RM) *.o *.a *.exe
rebuild: clean all
common/graphics/makefile
-5
View File
@@ -30,8 +30,3 @@ $(OUTDIR):
$(OBJDIR)/%.o: %.cpp
$(CXX) $(CXXFLAGS) -c -o $@ $<
clean:
$(RM) *.o *.a *.exe
rebuild: clean all
common/makefile
-5
View File
@@ -6,8 +6,3 @@ all:
$(MAKE) -C network
$(MAKE) -C ui
$(MAKE) -C utilities
clean:
$(RM) *.o *.a *.exe
rebuild: clean all
common/map/makefile
-5
View File
@@ -30,8 +30,3 @@ $(OUTDIR):
$(OBJDIR)/%.o: %.cpp
$(CXX) $(CXXFLAGS) -c -o $@ $<
clean:
$(RM) *.o *.a *.exe
rebuild: clean all
common/network/makefile
-5
View File
@@ -31,8 +31,3 @@ $(OUTDIR):
$(OBJDIR)/%.o: %.cpp
$(CXX) $(CXXFLAGS) -c -o $@ $<
clean:
$(RM) *.o *.a *.exe
rebuild: clean all
common/network/packet_types/makefile
-5
View File
@@ -30,8 +30,3 @@ $(OUTDIR):
$(OBJDIR)/%.o: %.cpp
$(CXX) $(CXXFLAGS) -c -o $@ $<
clean:
$(RM) *.o *.a *.exe
rebuild: clean all
common/network/packet_types/serial_packet_base.hpp
+1 -1
View File
@@ -24,7 +24,7 @@
#include "serial_packet_type.hpp"
#include "SDL/SDL_net.h"
#include "SDL_net.h"
constexpr int PACKET_STRING_SIZE = 100;
common/network/udp_network_utility.hpp
+1 -1
View File
@@ -27,7 +27,7 @@
#include "singleton.hpp"
//APIs
#include "SDL/SDL_net.h"
#include "SDL_net.h"
class UDPNetworkUtility : public Singleton<UDPNetworkUtility> {
public:
common/ui/makefile
-5
View File
@@ -30,8 +30,3 @@ $(OUTDIR):
$(OBJDIR)/%.o: %.cpp
$(CXX) $(CXXFLAGS) -c -o $@ $<
clean:
$(RM) *.o *.a *.exe
rebuild: clean all
common/utilities/ip_operators.hpp
+1 -1
View File
@@ -22,7 +22,7 @@
#ifndef IPOPERATORS_HPP_
#define IPOPERATORS_HPP_
#include "SDL/SDL_net.h"
#include "SDL_net.h"
//these should've come standard
bool operator==(IPaddress lhs, IPaddress rhs);
common/utilities/makefile
-5
View File
@@ -30,8 +30,3 @@ $(OUTDIR):
$(OBJDIR)/%.o: %.cpp
$(CXX) $(CXXFLAGS) -c -o $@ $<
clean:
$(RM) *.o *.a *.exe
rebuild: clean all
makefile
+12 -2
View File
@@ -19,13 +19,23 @@ release: clean all package
#For use on my machine ONLY
package:
rar a -r -ep Tortuga.rar $(OUTDIR)/*.exe $(OUTDIR)/*.dll
rar a -r Tortuga.rar rsc/* copyright.txt instructions.txt
ifeq ($(OS),Windows_NT)
rar a -r -ep Tortuga-win.rar $(OUTDIR)/*.exe $(OUTDIR)/*.dll
rar a -r Tortuga-win.rar rsc/* copyright.txt instructions.txt
else ifeq ($(shell uname), Linux)
tar -C $(OUTDIR) -zcvf Tortuga-linux.tar client server ../rsc ../copyright.txt ../instructions.txt
endif
$(OUTDIR):
mkdir $(OUTDIR)
clean:
ifeq ($(OS),Windows_NT)
$(RM) *.o *.a *.exe
else ifeq ($(shell uname), Linux)
find . -type f -name *.o -exec rm -f -r -v {} \;
find . -type f -name *.a -exec rm -f -r -v {} \;
rm -f -v out/client out/server
endif
rebuild: clean all
server/accounts/makefile
-5
View File
@@ -30,8 +30,3 @@ $(OUTDIR):
$(OBJDIR)/%.o: %.cpp
$(CXX) $(CXXFLAGS) -c -o $@ $<
clean:
$(RM) *.o *.a *.exe
rebuild: clean all
server/characters/character_manager.cpp
+1
View File
@@ -26,6 +26,7 @@
#include "character_defines.hpp"
#include <algorithm>
#include <cstring>
#include <stdexcept>
//-------------------------
server/characters/makefile
-5
View File
@@ -30,8 +30,3 @@ $(OUTDIR):
$(OBJDIR)/%.o: %.cpp
$(CXX) $(CXXFLAGS) -c -o $@ $<
clean:
$(RM) *.o *.a *.exe
rebuild: clean all
server/clients/client_data.hpp
+1 -1
View File
@@ -22,7 +22,7 @@
#ifndef CLIENTDATA_HPP_
#define CLIENTDATA_HPP_
#include "SDL/SDL_net.h"
#include "SDL_net.h"
#include <chrono>
server/clients/client_manager.hpp
+1 -1
View File
@@ -26,7 +26,7 @@
#include "server_packet.hpp"
#include "singleton.hpp"
#include "SDL/SDL_net.h"
#include "SDL_net.h"
#include <functional>
#include <list>
server/clients/makefile
-5
View File
@@ -30,8 +30,3 @@ $(OUTDIR):
$(OBJDIR)/%.o: %.cpp
$(CXX) $(CXXFLAGS) -c -o $@ $<
clean:
$(RM) *.o *.a *.exe
rebuild: clean all
server/entities/makefile
-5
View File
@@ -30,8 +30,3 @@ $(OUTDIR):
$(OBJDIR)/%.o: %.cpp
$(CXX) $(CXXFLAGS) -c -o $@ $<
clean:
$(RM) *.o *.a *.exe
rebuild: clean all
server/makefile
+11 -1
View File
@@ -1,5 +1,5 @@
#include directories
INCLUDES+=. accounts characters clients entities monsters rooms server_utilities triggers ../common/debugging ../common/gameplay ../common/map ../common/network ../common/network/packet_types ../common/utilities
INCLUDES+=SDL . accounts characters clients entities monsters rooms server_utilities triggers ../common/debugging ../common/gameplay ../common/map ../common/network ../common/network/packet_types ../common/utilities
#libraries
#the order of the $(LIBS) is important, at least for MinGW
@@ -8,6 +8,10 @@ ifeq ($(OS),Windows_NT)
LIBS+=-lwsock32 -liphlpapi -lmingw32
endif
LIBS+=-lSDLmain -lSDL -llua -lsqlite3
ifeq ($(shell uname), Linux)
#I don't know what this does, but Ubuntu needs it
LIBS+=-ldl
endif
#flags
CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
@@ -49,6 +53,12 @@ $(OBJDIR)/%.o: %.cpp
$(CXX) $(CXXFLAGS) -c -o $@ $<
clean:
ifeq ($(OS),Windows_NT)
$(RM) *.o *.a *.exe
else ifeq ($(shell uname), Linux)
find . -type f -name *.o -exec rm -f -r -v {} \;
find . -type f -name *.a -exec rm -f -r -v {} \;
rm -f -v out/client out/server
endif
rebuild: clean all
server/monsters/makefile
-5
View File
@@ -30,8 +30,3 @@ $(OUTDIR):
$(OBJDIR)/%.o: %.cpp
$(CXX) $(CXXFLAGS) -c -o $@ $<
clean:
$(RM) *.o *.a *.exe
rebuild: clean all
server/rooms/makefile
-5
View File
@@ -30,8 +30,3 @@ $(OUTDIR):
$(OBJDIR)/%.o: %.cpp
$(CXX) $(CXXFLAGS) -c -o $@ $<
clean:
$(RM) *.o *.a *.exe
rebuild: clean all
server/server_character_methods.cpp
+1
View File
@@ -21,6 +21,7 @@
*/
#include "server_application.hpp"
#include <cstring>
#include <iostream>
#include <sstream>
server/server_connections.cpp
+1
View File
@@ -21,6 +21,7 @@
*/
#include "server_application.hpp"
#include <cstring>
#include <iostream>
#include <sstream>
server/server_data_queries.cpp
+1
View File
@@ -21,6 +21,7 @@
*/
#include "server_application.hpp"
#include <cstring>
#include <iostream>
#include <sstream>
server/server_logic.cpp
+4 -1
View File
@@ -27,6 +27,7 @@
//std & STL
#include <stdexcept>
#include <chrono>
#include <cstring>
#include <iostream>
#include <list>
#include <sstream>
@@ -51,7 +52,9 @@ void ServerApplication::Init(int argc, char* argv[]) {
//Init SDL
if (SDL_Init(0)) {
throw(std::runtime_error("Failed to initialize SDL"));
std::ostringstream os;
os << "Failed to initialize SDL: " << SDL_GetError();
throw(std::runtime_error(os.str()));
}
std::cout << "Initialized SDL" << std::endl;
server/server_methods.cpp
+1
View File
@@ -22,6 +22,7 @@
#include "server_application.hpp"
#include <chrono>
#include <cstring>
#include <iostream>
#include <sstream>
server/server_utilities/makefile
-5
View File
@@ -30,8 +30,3 @@ $(OUTDIR):
$(OBJDIR)/%.o: %.cpp
$(CXX) $(CXXFLAGS) -c -o $@ $<
clean:
$(RM) *.o *.a *.exe
rebuild: clean all
server/server_utilities/network_api.cpp
+2
View File
@@ -25,6 +25,8 @@
#include "character_manager.hpp"
#include "server_utilities.hpp"
#include <cstring>
static int pumpCharacterUpdate(lua_State* L) {
CharacterData* characterData = static_cast<CharacterData*>(lua_touserdata(L, 1));
server/server_utilities/server_utilities.cpp
+2
View File
@@ -27,6 +27,8 @@
#include "room_manager.hpp"
#include "udp_network_utility.hpp"
#include <cstring>
//-------------------------
//manager unload functions
//-------------------------
server/triggers/makefile
-5
View File
@@ -30,8 +30,3 @@ $(OUTDIR):
$(OBJDIR)/%.o: %.cpp
$(CXX) $(CXXFLAGS) -c -o $@ $<
clean:
$(RM) *.o *.a *.exe
rebuild: clean all
todo.txt
+1
View File
@@ -1,4 +1,5 @@
TODO: upgrade to lua 5.3
TODO: upgrade to SDL 2.0
TODO: Split config.cfg in two, one for the server and the client
TODO: Consistency for bounds names