mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 22:20:51 +00:00
52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
## i-love-you-lordheavy.patch [diff]
|
|
diff -ru warmux-11.04/lib/warmux/action/action.cpp warmux-11.04-new/lib/warmux/action/action.cpp
|
|
--- warmux-11.04/lib/warmux/action/action.cpp 2011-04-28 21:03:14.000000000 +0200
|
|
+++ warmux-11.04-new/lib/warmux/action/action.cpp 2012-01-29 09:51:16.680251815 +0100
|
|
@@ -81,7 +81,7 @@
|
|
}
|
|
|
|
// Build an action from a network packet
|
|
-Action::Action(const char *buffer, DistantComputer* _creator)
|
|
+Action::Action(char *buffer, DistantComputer* _creator)
|
|
{
|
|
m_creator = _creator;
|
|
|
|
diff -ru warmux-11.04/lib/warmux/include/WARMUX_action.h warmux-11.04-new/lib/warmux/include/WARMUX_action.h
|
|
--- warmux-11.04/lib/warmux/include/WARMUX_action.h 2011-04-28 21:03:13.000000000 +0200
|
|
+++ warmux-11.04-new/lib/warmux/include/WARMUX_action.h 2012-01-29 09:52:14.246921833 +0100
|
|
@@ -168,7 +168,7 @@
|
|
Action(Action_t type, Double value1, Double value2);
|
|
|
|
// Build an action from a network packet
|
|
- Action(const char* buffer, DistantComputer* _creator);
|
|
+ Action(char* buffer, DistantComputer* _creator);
|
|
|
|
~Action();
|
|
|
|
Description: Fix FTBFS with gcc 4.7.
|
|
Author: Felix Geyer <debfx-pkg@fobos.de>
|
|
|
|
--- warmux-11.04.1+repack.orig/tools/list_games/main.cpp
|
|
+++ warmux-11.04.1+repack/tools/list_games/main.cpp
|
|
@@ -1,4 +1,5 @@
|
|
#include <stdio.h>
|
|
+#include <unistd.h>
|
|
#include <WARMUX_types.h>
|
|
#include <WARMUX_network.h>
|
|
#include <WARMUX_index_server.h>
|
|
|
|
Description: Fix conversion error in gcc 6.
|
|
Author: Robin Gloster <mail@glob.in>
|
|
|
|
--- warmux-11.04.1.orig/src/interface/weapon_menu.cpp 2017-01-19 23:06:32.401035923 +0100
|
|
+++ warmux-11.04.1/src/interface/weapon_menu.cpp 2017-01-19 23:07:14.245866593 +0100
|
|
@@ -391,7 +391,7 @@
|
|
Weapon * WeaponsMenu::UpdateCurrentOverflyItem(const Polygon * poly)
|
|
{
|
|
if (!show)
|
|
- return false;
|
|
+ return nullptr;
|
|
const std::vector<PolygonItem *>& items = poly->GetItem();
|
|
WeaponMenuItem * tmp;
|
|
Interface::GetInstance()->SetCurrentOverflyWeapon(NULL);
|