Mercurial > otakunoraifu

changeset 61:bdd8a5ff8f46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert an old change that disabled cursors...
author Thibaut GIRKA <thib@sitedethib.com>
date Fri, 18 Dec 2009 21:07:29 +0100
parents e16e13d8cd68
children 3b1593186f12
files scn2k/scn2k_grpimpl.cc scn2k/scn2k_impl.cc
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/scn2k/scn2k_grpimpl.cc
+++ b/scn2k/scn2k_grpimpl.cc
@@ -516,10 +516,13 @@ void Grp::impl_objColour(Cmd& cmd) {
 void Grp::impl_objComposite(Cmd& cmd) {//FIXME
 	int base_arg = 0;
 	GrpObj* g = GetGraphicObjVarMode(cmd, base_arg, (cmd.cmd2 == 0x51));
-	if (cmd.args[base_arg + 1].value == 1) {
+	if (cmd.args[base_arg + 1].value == 1)
+	{
 		g->attr = GrpObj::Attribute(g->attr | GrpObj::BLIT_ADD);
 		cmd.clear();
-	} else if (cmd.args[base_arg + 1].value == 0) {
+	}
+	else if (cmd.args[base_arg + 1].value == 0)
+	{
 		g->attr = GrpObj::Attribute(g->attr & (~GrpObj::BLIT_ADD));
 		cmd.clear();
 	}
--- a/scn2k/scn2k_impl.cc
+++ b/scn2k/scn2k_impl.cc
@@ -396,7 +396,7 @@ void Scn2k::ShowCursor(void) {
 	const char* name = config->GetParaStr(key);
 	if (name == NULL || name[0] == 0) mouse_surface = DEFAULT_MOUSECURSOR;
 	else
-		mouse_surface = parent.Root().NewSurface("toto", COLOR_MASK);
+		mouse_surface = parent.Root().NewSurface(name, COLOR_MASK);
 	if (mouse_surface == NULL)
 		mouse_surface = DEFAULT_MOUSECURSOR;
 	System::Main::SetCursor(mouse_surface, Rect(8, 8, 8+32, 8+32));