# HG changeset patch
# User Thibaut GIRKA <thib@sitedethib.com>
# Date 1261166849 -3600
# Node ID bdd8a5ff8f46ca12c50a451178349fb63f785484
# Parent  e16e13d8cd68579c1d1fb3acef1a55f6c8936583
Revert an old change that disabled cursors...

diff --git a/scn2k/scn2k_grpimpl.cc b/scn2k/scn2k_grpimpl.cc
--- 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();
 	}
diff --git a/scn2k/scn2k_impl.cc b/scn2k/scn2k_impl.cc
--- 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));