head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.10
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.8
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.6
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.4
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.2
	pkgsrc-2025Q1-base:1.1;
locks; strict;
comment	@// @;


1.1
date	2025.02.09.08.45.39;	author triaxx;	state Exp;
branches;
next	;
commitid	CRQm6ogGqtafVLIF;


desc
@@


1.1
log
@xye: Update to 0.12.2

upstream changes:
-----------------
0.12.2 (SVN r404)
  - Create pixmaps folder.
  - Will install icon to installpath/share/pixmaps
  - Will install launcher to installpath/share/applications
  - Other minor modifications to build scripts.
@
text
@$NetBSD$

Avoid ambiguity with std::lock.

--- src/xye_script.cpp.orig	2025-02-09 07:35:18.118738041 +0000
+++ src/xye_script.cpp
@@@@ -859,7 +859,7 @@@@ void Load_Lock(TiXmlElement* el)
         el->QueryIntAttribute("x",&LastX);
         el->QueryIntAttribute("y",&LastY);
         blockcolor c=GetElementBlockColor(el);
-    lock* bc=new lock(game::SquareN(LastX,LastY),c);
+        xye_lock* bc=new xye_lock(game::SquareN(LastX,LastY),c);
 }
 
 /* Load Key*/
@