jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-06 05:23:56 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

rebase fix

Browse source
This commit is contained in:
DawnFire42 2026-06-30 09:36:21 -04:00
parent bc09a19b50
commit 04f18aa0c8
No known key found for this signature in database
GPG key ID: 24BB855EE2911B33
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/game_graphics/player/menu/command_zone_menu.cpp
View file

@ -9,7 +9,7 @@
#include "../player_graphics_item.h" #include "../player_graphics_item.h"
#include <libcockatrice/utility/counter_ids.h> #include <libcockatrice/utility/counter_ids.h>
#include <libcockatrice/utility/trice_limits.h> #include <libcockatrice/utility/counter_limits.h>
#include <libcockatrice/utility/zone_names.h> #include <libcockatrice/utility/zone_names.h>
CommandZoneMenu::CommandZoneMenu(PlayerGraphicsItem *_player, QMenu *playerMenu) : QMenu(playerMenu), player(_player) CommandZoneMenu::CommandZoneMenu(PlayerGraphicsItem *_player, QMenu *playerMenu) : QMenu(playerMenu), player(_player)

1
libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp
View file

@ -50,6 +50,7 @@
#include <libcockatrice/rng/rng_abstract.h> #include <libcockatrice/rng/rng_abstract.h>
#include <libcockatrice/utility/color.h> #include <libcockatrice/utility/color.h>
#include <libcockatrice/utility/counter_ids.h> #include <libcockatrice/utility/counter_ids.h>
#include <libcockatrice/utility/counter_limits.h>
#include <libcockatrice/utility/string_limits.h> #include <libcockatrice/utility/string_limits.h>
#include <libcockatrice/utility/zone_names.h> #include <libcockatrice/utility/zone_names.h>

2
tests/server_counter_test.cpp
View file

@ -5,7 +5,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <libcockatrice/network/server/remote/game/server_counter.h> #include <libcockatrice/network/server/remote/game/server_counter.h>
#include <libcockatrice/utility/trice_limits.h> #include <libcockatrice/utility/counter_limits.h>
#include <limits> #include <limits>
TEST(ServerCounter, IncrementDoesNotOverflow) TEST(ServerCounter, IncrementDoesNotOverflow)