PROTOCOL_VERSION, test items, MOTD fix (#18)

* Cleaned up protocol selection.

* cmake now works even if protocol option is omitted
* make now supports protocol selection
* removed PACKET_VERSION/CNPROTO_VERSION* redundancy
* ubuntu appveyor script has yet to be written
* cleaned up some trailing spaces

* Add some test items.

Ironically, this change is untested.

* [bugfix] Transmit MOTD when entering the game, not when loading screen fades.

This fixes unnecessary retransmission when /warping.
This commit is contained in:
dongresource
2020-08-21 19:38:45 +02:00
committed by GitHub
parent 1669ee3660
commit df18f3ccd1
6 changed files with 49 additions and 30 deletions

View File

@@ -1,10 +1,14 @@
CXX=clang++
# -w suppresses all warnings (the part that's commented out helps me find memory leaks, it ruins performance though!)
CXXFLAGS=-std=c++17 -O3 #-g3 -fsanitize=address
CXXFLAGS=-std=c++17 -O3 -DPROTOCOL_VERSION=$(PROTOCOL_VERSION) #-g3 -fsanitize=address
LDFLAGS=-lpthread
# specifies the name of our exectuable
SERVER=bin/fusion
# assign protocol version
# this can be overriden by ex. make PROTOCOL_VERSION=728
PROTOCOL_VERSION?=104
# Windows-specific
WIN_CXX=x86_64-w64-mingw32-g++
WIN_CXXFLAGS=-std=c++17 -O3 #-g3 -fsanitize=address
@@ -49,7 +53,7 @@ all: $(SERVER)
windows: $(SERVER)
# Assign Windows-specific values if targeting Windows
# assign Windows-specific values if targeting Windows
windows : CXX=$(WIN_CXX)
windows : CXXFLAGS=$(WIN_CXXFLAGS)
windows : LDFLAGS=$(WIN_LDFLAGS)