Skip to content

Commit

Permalink
Merge pull request #17 from diasurgical/menu
Browse files Browse the repository at this point in the history
Main menu and hero selection screen are now px perfect
  • Loading branch information
ApertureSecurity committed Jan 20, 2019
2 parents 74fb68b + 937afed commit 8b21231
Show file tree
Hide file tree
Showing 21 changed files with 2,990 additions and 4,530 deletions.
6 changes: 2 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# Generated by VC++ 6 builds
/vc60.idb

#ignore cmake cache and keep devilution.
!build/devilution
build/*
#ignore cmake cache
/build/
.vscode/tasks.json


# ELF object file.
*.o

Expand Down
2 changes: 2 additions & 0 deletions 3rdParty/Storm/Source/storm.h
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,8 @@ SNetSendMessage(
#define SNPLAYER_ALL -1
#define SNPLAYER_OTHERS -2

#define MPQ_FLAG_READ_ONLY 1


/* SNetSendTurn @ 128
*
Expand Down
4 changes: 1 addition & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ set(SOURCES
Source/drlg_l2.cpp
Source/drlg_l3.cpp
Source/drlg_l4.cpp
# Source/effects.cpp
Source/effects.cpp
Source/encrypt.cpp
Source/engine.cpp
Source/error.cpp
Expand Down Expand Up @@ -103,7 +103,6 @@ set(ORIGINAL_SOURCES
Source/capture.cpp
Source/appfat.cpp
Source/dthread.cpp
Source/effects.cpp
Source/dx.cpp
Source/fault.cpp
Source/init.cpp
Expand Down Expand Up @@ -134,7 +133,6 @@ set(STUB_SOURCES
Stub/miniwin_msg_sdl.cpp
Stub/storm_net.cpp
Stub/validate.cpp
Stub/effects.cpp
Stub/sdlrender.cpp
Stub/diablo.cpp
Stub/gamemenu.cpp
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ As a side goal Devilution tries to document the unused and cut content from the
# How To Play:
- Install Diablo
- copy diabdat.mpq to Diablo game directory ; Make sure it is all lowercase.
- [Download This Pre-Alpha MPQ ](https://github.com/diasurgical/devilutionX/blob/master/prealpha.mpq)
- [Download Devilution](https://github.com/diasurgical/devilutionX/blob/master/build/devilution)


Expand Down

0 comments on commit 8b21231

Please sign in to comment.