Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test #140

Merged
merged 3 commits into from
Mar 5, 2022
Merged

test #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0542ddf
Lots o' cool stuff (#637)
SheridanR Mar 5, 2022
5004b64
More Misc fixes (#636)
WALLOFJUSTICE Mar 5, 2022
f4590b6
Fix minor compilation issue
SheridanR Mar 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,11 @@ if( NOT WIN32 )
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${OPTIMIZATION_LEVEL} -ffast-math -funroll-loops -fstrict-aliasing -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp -g -fuse-ld=gold -fuse-linker-plugin -fsingle-precision-constant")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${OPTIMIZATION_LEVEL} -ffast-math -funroll-loops -fstrict-aliasing -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp -g -fuse-ld=gold -fuse-linker-plugin -fsingle-precision-constant")
else()
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -pedantic -Wno-multichar -pg -ffast-math -funroll-loops -fstrict-aliasing")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wpedantic -Wno-multichar -pg -ffast-math -funroll-loops -fstrict-aliasing")
#set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pg -fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined -fno-sanitize-recover -Wreturn-type -Werror=return-type")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pedantic -Wno-multichar -pg")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -pedantic -Wno-multichar ${OPTIMIZATION_LEVEL} -ffast-math -funroll-loops -fstrict-aliasing")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -pedantic -Wno-multichar ${OPTIMIZATION_LEVEL}")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wpedantic -Wno-multichar -pg")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Wpedantic -Wno-multichar ${OPTIMIZATION_LEVEL} -ffast-math -funroll-loops -fstrict-aliasing")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wpedantic -Wno-multichar ${OPTIMIZATION_LEVEL}")
endif()
if (APPLE)
set (Apple 1)
Expand Down
3 changes: 3 additions & 0 deletions lang/en.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6056,5 +6056,8 @@ Cast#
4099 Took %d items from the chest.#
4100 You have no room left in your pack!#
4101 You reignite another %s.#
4102 Appraise item#
4103 View spell details#
4104 Hide spell details#

4199 end#
27 changes: 1 addition & 26 deletions src/game.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,32 +836,6 @@ void gameLogic(void)
{
fadefinished = true;
}
if ( multiplayer == SERVER && introstage == 3 )
{
// machinegun this message to clients to make sure they get it!
for ( c = 1; c < MAXPLAYERS; c++ )
{
if ( client_disconnected[c] || players[c]->isLocalPlayer() )
{
continue;
}
strcpy((char*)net_packet->data, "STRT");
SDLNet_Write32(svFlags, &net_packet->data[4]);
SDLNet_Write32(uniqueGameKey, &net_packet->data[8]);
if ( loadingsavegame == 0 )
{
net_packet->data[12] = 0;
}
else
{
net_packet->data[12] = 1;
}
net_packet->address.host = net_clients[c - 1].host;
net_packet->address.port = net_clients[c - 1].port;
net_packet->len = 13;
sendPacket(net_sock, -1, net_packet, c - 1);
}
}
}
else
{
Expand Down Expand Up @@ -3178,6 +3152,7 @@ void handleEvents(void)
for (auto& input : Input::inputs) {
input.updateReleasedBindings();
input.update();
input.consumeBindingsSharedWithFaceHotbar();
}

while ( SDL_PollEvent(&event) ) // poll SDL events
Expand Down
Loading