99425e0bd2
file, don't include the SUBST results in the patch, and add a missing dep on libX11. PKGREVISION++.
29 lines
727 B
Text
29 lines
727 B
Text
$NetBSD: patch-ao,v 1.2 2008/08/17 23:50:06 dholland Exp $
|
|
|
|
--- cmn/game_style.cpp.orig 2003-03-22 20:47:42.000000000 -0500
|
|
+++ cmn/game_style.cpp 2008-08-17 19:16:52.000000000 -0400
|
|
@@ -29,12 +29,11 @@
|
|
|
|
// Include Files
|
|
#include "stdafx.h"
|
|
-extern "C" {
|
|
-#include <string.h>
|
|
-}
|
|
+#include <cstring>
|
|
|
|
#if X11
|
|
-#include <strstream.h>
|
|
+#include <strstream>
|
|
+using namespace std;
|
|
#endif
|
|
|
|
#if WIN32
|
|
@@ -2680,7 +2679,7 @@ int ZigZag::new_level_check(int,WorldP w
|
|
HumanP human = locator->get_human(n);
|
|
if (human) {
|
|
// previous depth
|
|
- int depthOld = (int)human->get_data();
|
|
+ int depthOld = (int)(intptr_t)human->get_data();
|
|
Id id = human->get_id();
|
|
|
|
// Get physical for intelligence
|