mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-24 22:14:36 +02:00
- fixed battle obstacles positioning (#769)
- removed unused Makefile.amiga and Makefile.x
This commit is contained in:
Ivan Savenko
parent
fd625fe87d
commit
08417cd42a
@ -1,67 +0,0 @@
|
||||
CC = ppc-amigaos-g++
|
||||
CFLAGS = -I. `sdl-config --cflags` -I/usr/local/include/boost-1_35 -Ilua -fpermissive
|
||||
#OPTIM = -O3
|
||||
DEBUG = -g -D_DEBUG
|
||||
LDFLAGS = -use-dynld
|
||||
BOOSTLIBS = -lboost_system-gcc42-mt-1_35 -lboost_filesystem-gcc42-mt-1_35
|
||||
LIBS = $(BOOSTLIBS) -llua -lSDL -lSDL_image -ltiff -ljpeg -lpng -lSDL_ttf -lft2 -lSDL_mixer -lvorbisfile -lvorbis -logg -lSMPEG -lSDL -lm -lz -lpthread -ldl -lunix -lauto
|
||||
EXE = vcmi
|
||||
|
||||
SOURCES = AdventureMapButton.cpp \
|
||||
CAdvmapInterface.cpp \
|
||||
CBattleInterface.cpp \
|
||||
CCallback.cpp \
|
||||
CCastleInterface.cpp \
|
||||
CKingdomInterface.cpp \
|
||||
CConsoleHandler.cpp \
|
||||
CCursorHandler.cpp \
|
||||
CGameInfo.cpp \
|
||||
CGameInterface.cpp \
|
||||
CGameState.cpp \
|
||||
CHeroWindow.cpp \
|
||||
CLua.cpp \
|
||||
CLuaHandler.cpp \
|
||||
CMT.cpp \
|
||||
CMessage.cpp \
|
||||
CPathfinder.cpp \
|
||||
CPlayerInterface.cpp \
|
||||
CPreGame.cpp \
|
||||
CScreenHandler.cpp \
|
||||
SDL_Extensions.cpp \
|
||||
SDL_framerate.cpp \
|
||||
SDL_rotozoom.cpp \
|
||||
map.cpp \
|
||||
mapHandler.cpp \
|
||||
stdafx.cpp \
|
||||
hch/CAbilityHandler.cpp \
|
||||
hch/CAmbarCendamo.cpp \
|
||||
hch/CArtHandler.cpp \
|
||||
hch/CBuildingHandler.cpp \
|
||||
hch/CCastleHandler.cpp \
|
||||
hch/CCreatureHandler.cpp \
|
||||
hch/CDefHandler.cpp \
|
||||
hch/CDefObjInfoHandler.cpp \
|
||||
hch/CGeneralTextHandler.cpp \
|
||||
hch/CHeroHandler.cpp \
|
||||
hch/CLodHandler.cpp \
|
||||
hch/CMusicHandler.cpp \
|
||||
hch/CObjectHandler.cpp \
|
||||
hch/CPreGameTextHandler.cpp \
|
||||
hch/CSemiDefHandler.cpp \
|
||||
hch/CSemiLodHandler.cpp \
|
||||
hch/CSndHandler.cpp \
|
||||
hch/CSpellHandler.cpp \
|
||||
hch/CTownHandler.cpp
|
||||
|
||||
OBJECTS=$(SOURCES:.cpp=.o)
|
||||
|
||||
all: $(SOURCES) $(EXE)
|
||||
|
||||
$(EXE): $(OBJECTS)
|
||||
$(CC) $(LDFLAGS) $(OBJECTS) -o $@ $(LIBS)
|
||||
|
||||
.cpp.o:
|
||||
$(CC) -c $(OPTIM) $(DEBUG) $(CFLAGS) $< -o $@
|
||||
|
||||
clean:
|
||||
rm -f *.o hch/*.o $(EXE)
|
||||
100
Makefile.x
100
Makefile.x
@ -1,100 +0,0 @@
|
||||
CC = g++
|
||||
CFLAGS = -I/Library/Frameworks/SDL_mixer.framework/Headers -I/Library/Frameworks/SDL.framework/Headers -I/Library/Frameworks/SDL_image.framework/Headers -I/Library/Frameworks/SDL_ttf.framework/Headers -I/opt/local/include
|
||||
OPTIM = -O2
|
||||
#DEBUG = -ggdb -D_DEBUG
|
||||
LDFLAGS = -Wl,-framework,SDL -Wl,-framework,SDL_mixer -Wl,-framework,SDL_image -Wl,-framework,SDL_ttf -Wl,-framework,Cocoa
|
||||
BOOSTLIBS = -L/opt/local/lib -lboost_system-mt -lboost_filesystem-mt -lboost_thread-mt
|
||||
LIBS = $(BOOSTLIBS) -llua -ljpeg -lpng -lm -lpthread -ldl -lauto -lz
|
||||
VCMI_CLIENT = vcmiclient
|
||||
VCMI_LIB = VCMI_Lib.dylib
|
||||
VCMI_SERVER = vcmiserver
|
||||
GENIUS_AI = GeniusAI.dll
|
||||
|
||||
CLIENT_SOURCES = AdventureMapButton.cpp \
|
||||
CAdvmapInterface.cpp \
|
||||
CBattleInterface.cpp \
|
||||
CCallback.cpp \
|
||||
CCastleInterface.cpp \
|
||||
CCursorHandler.cpp \
|
||||
CGameInfo.cpp \
|
||||
CGameInterface.cpp \
|
||||
CHeroWindow.cpp \
|
||||
CMT.cpp \
|
||||
CMessage.cpp \
|
||||
CPlayerInterface.cpp \
|
||||
CPreGame.cpp \
|
||||
CThreadHelper.cpp \
|
||||
SDL_Extensions.cpp \
|
||||
SDL_framerate.cpp \
|
||||
client/CBitmapHandler.cpp \
|
||||
client/CConfigHandler.cpp \
|
||||
client/CCreatureAnimation.cpp \
|
||||
client/CSpellWindow.cpp \
|
||||
client/Client.cpp \
|
||||
client/Graphics.cpp \
|
||||
hch/CDefHandler.cpp \
|
||||
hch/CMusicHandler.cpp \
|
||||
hch/CSndHandler.cpp \
|
||||
mapHandler.cpp \
|
||||
client/NetPacksClient.cpp \
|
||||
SDLMain.m
|
||||
|
||||
LIB_SOURCES = CConsoleHandler.cpp \
|
||||
CGameState.cpp \
|
||||
hch/CArtHandler.cpp \
|
||||
hch/CBuildingHandler.cpp \
|
||||
hch/CCreatureHandler.cpp \
|
||||
hch/CDefObjInfoHandler.cpp \
|
||||
hch/CGeneralTextHandler.cpp \
|
||||
hch/CHeroHandler.cpp \
|
||||
hch/CLodHandler.cpp \
|
||||
hch/CObjectHandler.cpp \
|
||||
hch/CSpellHandler.cpp \
|
||||
hch/CTownHandler.cpp \
|
||||
lib/Connection.cpp \
|
||||
lib/IGameCallback.cpp \
|
||||
lib/VCMI_Lib.cpp \
|
||||
lib/NetPacksLib.cpp \
|
||||
lib/RegisterTypes.cpp \
|
||||
map.cpp
|
||||
|
||||
SERVER_SOURCES = \
|
||||
server/CGameHandler.cpp \
|
||||
server/NetPacksServer.cpp \
|
||||
server/CVCMIServer.cpp
|
||||
|
||||
GENIUS_SOURCES = \
|
||||
AI/GeniusAI/CGeniusAI.cpp \
|
||||
AI/GeniusAI/DLLMain.cpp
|
||||
|
||||
OBJECTS=$(CLIENT_SOURCES:.cpp=.o)
|
||||
CLIENT_OBJECTS=$(OBJECTS:.m=.o)
|
||||
LIB_OBJECTS=$(LIB_SOURCES:.cpp=.o)
|
||||
SERVER_OBJECTS=$(SERVER_SOURCES:.cpp=.o)
|
||||
GENIUS_OBJECTS=$(GENIUS_SOURCES:.cpp=.o)
|
||||
|
||||
all: $(CLIENT_SOURCES) $(LIB_SOURCES) $(SERVER_SOURCES) $(VCMI_CLIENT) $(VCMI_SERVER) $(GENIUS_AI)
|
||||
|
||||
update:
|
||||
svn co https://vcmi.svn.sourceforge.net/svnroot/vcmi/trunk .
|
||||
|
||||
$(VCMI_CLIENT): $(CLIENT_OBJECTS) $(VCMI_LIB)
|
||||
$(CC) $(LDFLAGS) $(CLIENT_OBJECTS) $(VCMI_LIB) -o $@ $(BOOSTLIBS) -lz
|
||||
|
||||
$(VCMI_SERVER): $(SERVER_OBJECTS) $(VCMI_LIB)
|
||||
$(CC) $(SERVER_OBJECTS) $(VCMI_LIB) -o $@ $(BOOSTLIBS)
|
||||
|
||||
$(GENIUS_AI): $(GENIUS_OBJECTS) $(VCMI_LIB)
|
||||
$(CC) -dynamiclib -install_name $@ $(GENIUS_OBJECTS) $(VCMI_LIB) -o $@
|
||||
|
||||
$(VCMI_LIB): $(LIB_OBJECTS)
|
||||
$(CC) -dynamiclib -install_name $@ $(LIB_OBJECTS) -o $@ $(BOOSTLIBS) -lz
|
||||
|
||||
.cpp.o:
|
||||
$(CC) -c $(OPTIM) $(DEBUG) $(CFLAGS) $< -o $@
|
||||
|
||||
.m.o:
|
||||
$(CC) -c $(OPTIM) $(DEBUG) $(CFLAGS) $< -o $@
|
||||
|
||||
clean:
|
||||
rm -f $(CLIENT_OBJECTS) $(SERVER_OBJECTS) $(LIB_OBJECTS) $(GENIUS_OBJECTS) $(VCMI_CLIENT) $(VCMI_SERVER) $(GENIUS_AI) $(VCMI_LIB)
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
"obstacles": [
|
||||
{ "id": 5, "defname": "OBBDT01.DEF", "blockmap": "LNXXX", "terrains": "1111110000000000000000100", "shift_x": -8, "shift_y": 0 },
|
||||
{ "id": 56, "defname": "OBBHS02.DEF", "blockmap": "XXLNX", "terrains": "1100000000000000000000100", "shift_x": -8, "shift_y": 0 },
|
||||
{ "id": 56, "defname": "OBBHS02.DEF", "blockmap": "XXLNX", "terrains": "1100000000000000000000000", "shift_x": -8, "shift_y": 0 },
|
||||
{ "id": 57, "defname": "OBBHS03.DEF", "blockmap": "LXXX", "terrains": "1111100000000000000000100", "shift_x": -8, "shift_y": 0 },
|
||||
{ "id": 91, "defname": "OBBHS04.DEF", "blockmap": "XXLNXX", "terrains": "1100000000000000000000000", "shift_x": -40, "shift_y": -20 },
|
||||
{ "id": 58, "defname": "OBBHS11A.DEF", "blockmap": "XXXLNXXX", "terrains": "1100000000000000000000000", "shift_x": -8, "shift_y": 0 },
|
||||
|
||||
@ -107,7 +107,7 @@ std::vector<BattleHex> CObstacleInfo::getBlocked(BattleHex hex) const
|
||||
break;
|
||||
case 'L':
|
||||
cur = curBeg + GameConstants::BFIELD_WIDTH;
|
||||
if((cur/GameConstants::BFIELD_WIDTH)%2 == 1)
|
||||
if((cur/GameConstants::BFIELD_WIDTH)%2 != 1)
|
||||
{
|
||||
cur--;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user