[Scummvm-cvs-logs] SF.net SVN: scummvm: [32001] scummvm/trunk/engines/drascula

aquadran at users.sourceforge.net aquadran at users.sourceforge.net
Sun May 11 11:44:03 CEST 2008


Revision: 32001
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32001&view=rev
Author:   aquadran
Date:     2008-05-11 02:44:01 -0700 (Sun, 11 May 2008)

Log Message:
-----------
remove dead code

Modified Paths:
--------------
    scummvm/trunk/engines/drascula/animation.cpp
    scummvm/trunk/engines/drascula/drascula.cpp
    scummvm/trunk/engines/drascula/drascula.h
    scummvm/trunk/engines/drascula/talk.cpp

Modified: scummvm/trunk/engines/drascula/animation.cpp
===================================================================
--- scummvm/trunk/engines/drascula/animation.cpp	2008-05-11 09:20:19 UTC (rev 32000)
+++ scummvm/trunk/engines/drascula/animation.cpp	2008-05-11 09:44:01 UTC (rev 32001)
@@ -401,8 +401,6 @@
 	tiempou = (unsigned int)tiempol / 2;
 	_rnd->setSeed(tiempou);
 
-	buffer_teclado();
-
 	color_abc(ROJO);
 
 	if (hay_sb == 1) {
@@ -439,7 +437,6 @@
 
 	if (key != 0)
 		ctvd_stop();
-	buffer_teclado();
 	if (hay_sb == 1) {
 		if (LookForFree() != 0)
 			goto bucless;

Modified: scummvm/trunk/engines/drascula/drascula.cpp
===================================================================
--- scummvm/trunk/engines/drascula/drascula.cpp	2008-05-11 09:20:19 UTC (rev 32000)
+++ scummvm/trunk/engines/drascula/drascula.cpp	2008-05-11 09:44:01 UTC (rev 32001)
@@ -502,7 +502,6 @@
 
 	if (num_ejec == 1) {
 		agarra_objeto(28);
-		buffer_teclado();
 
 		if (hay_que_load == 0)
 			animation_1_1();
@@ -524,7 +523,6 @@
 		}
 	} else if (num_ejec == 2) {
 		suma_objeto(28);
-		buffer_teclado();
 		sentido_hare = 3;
 		obj_saliendo = 162;
 		if (hay_que_load == 0)
@@ -543,7 +541,6 @@
 		suma_objeto(20);
 		suma_objeto(19);
 		flags[1] = 1;
-		buffer_teclado();
 		sentido_hare = 1;
 		obj_saliendo = 99;
 		if (hay_que_load == 0)
@@ -558,7 +555,6 @@
 		suma_objeto(9);
 		suma_objeto(20);
 		suma_objeto(22);
-		buffer_teclado();
 		obj_saliendo = 100;
 		if (hay_que_load == 0) {
 			carga_escoba("21.ald");
@@ -580,7 +576,6 @@
 		suma_objeto(15);
 		suma_objeto(17);
 		suma_objeto(20);
-		buffer_teclado();
 		sentido_hare = 1;
 		obj_saliendo = 100;
 		if (hay_que_load == 0) {
@@ -594,7 +589,6 @@
 		suma_objeto(28);
 		suma_objeto(9);
 
-		buffer_teclado();
 		sentido_hare = 1;
 		obj_saliendo = 104;
 		if (hay_que_load == 0) {
@@ -890,8 +884,6 @@
 	strcpy(para_codificar, nom_fich);
 	strcpy(datos_actuales, nom_fich);
 
-	buffer_teclado();
-
 	ald = new Common::File;
 	ald->open(nom_fich);
 	if (!ald->isOpen()) {
@@ -1608,7 +1600,6 @@
 	clearRoom();
 	loadPic(num_room);
 	decompressPic(dir_dibujo1, MEDIA);
-	buffer_teclado();
 	hay_seleccion = 0;
 
 	return true;
@@ -3205,7 +3196,6 @@
 	char select2[23];
 	strcpy(select2, "                      ");
 	for (;;) {
-		buffer_teclado();
 		select2[v] = '-';
 		copyBackground(115, 14, 115, 14, 176, 9, dir_dibujo1, dir_zona_pantalla);
 		print_abc(select2, 117, 15);
@@ -4522,8 +4512,6 @@
 	int longitud;
 	longitud = 30;
 
-	buffer_teclado();
-
 	color_abc(VERDE_OSCURO);
 
 	if (hay_sb == 1) {
@@ -4549,7 +4537,6 @@
 	int key = getscan();
 	if (key != 0)
 		ctvd_stop();
-	buffer_teclado();
 	if (hay_sb == 1) {
 		if (LookForFree() != 0)
 			goto bucless;

Modified: scummvm/trunk/engines/drascula/drascula.h
===================================================================
--- scummvm/trunk/engines/drascula/drascula.h	2008-05-11 09:20:19 UTC (rev 32000)
+++ scummvm/trunk/engines/drascula/drascula.h	2008-05-11 09:44:01 UTC (rev 32001)
@@ -483,7 +483,6 @@
 	void hipo_sin_nadie(int contador);
 	void abre_puerta(int nflag, int n_puerta);
 	void mapa();
-	void buffer_teclado() { }
 	void animation_1_1();
 	void animation_2_1();
 	void animation_1_2();

Modified: scummvm/trunk/engines/drascula/talk.cpp
===================================================================
--- scummvm/trunk/engines/drascula/talk.cpp	2008-05-11 09:20:19 UTC (rev 32000)
+++ scummvm/trunk/engines/drascula/talk.cpp	2008-05-11 09:44:01 UTC (rev 32001)
@@ -41,8 +41,6 @@
 	tiempou = (unsigned int)tiempol / 2;
 	_rnd->setSeed(tiempou);
 
-	buffer_teclado();
-
 	color_abc(BLANCO);
 
 	if (hay_sb == 1) {
@@ -84,7 +82,6 @@
 		term_int = 1;
 	if (key != 0)
 		ctvd_stop();
-	buffer_teclado();
 	if (hay_sb == 1) {
 		if (LookForFree() != 0)
 			goto bucless;
@@ -116,8 +113,6 @@
 	tiempou = (unsigned int)tiempol / 2;
 	_rnd->setSeed(tiempou);
 
-	buffer_teclado();
-
 	color_abc(ROJO);
 
 	if (hay_sb == 1) {
@@ -164,7 +159,6 @@
 		term_int = 1;
 	if (key != 0)
 		ctvd_stop();
-	buffer_teclado();
 	if (hay_sb == 1) {
 		if (LookForFree() != 0)
 			goto bucless;
@@ -197,8 +191,6 @@
 	tiempou = (unsigned int)tiempol / 2;
 	_rnd->setSeed(tiempou);
 
-	buffer_teclado();
-
 	color_abc(ROJO);
 
 	if (hay_sb == 1) {
@@ -244,7 +236,6 @@
 		term_int = 1;
 	if (key != 0)
 		ctvd_stop();
-	buffer_teclado();
 	if (hay_sb == 1) {
 		if (LookForFree() != 0)
 			goto bucless;
@@ -314,7 +305,6 @@
 		term_int = 1;
 	if (key != 0)
 		ctvd_stop();
-	buffer_teclado();
 	if (hay_sb == 1) {
 		if (LookForFree() != 0)
 			goto bucless;
@@ -346,8 +336,6 @@
 	tiempou = (unsigned int)tiempol / 2;
 	_rnd->setSeed(tiempou);
 
-	buffer_teclado();
-
 	color_abc(BLANCO);
 
 	if (hay_sb == 1) {
@@ -391,7 +379,6 @@
 		term_int = 1;
 	if (key != 0)
 		ctvd_stop();
-	buffer_teclado();
 	if (hay_sb == 1) {
 		if (LookForFree() != 0)
 			goto bucless;
@@ -430,8 +417,6 @@
 	tiempou = (unsigned int)tiempol / 2;
 	_rnd->setSeed(tiempou);
 
-	buffer_teclado();
-
 	color_abc(MARRON);
 
 	if (hay_sb == 1) {
@@ -475,7 +460,6 @@
 	byte key = getscan();
 	if (key != 0)
 		ctvd_stop();
-	buffer_teclado();
 	if (hay_sb == 1) {
 		if (LookForFree() != 0)
 			goto bucless;
@@ -505,8 +489,6 @@
 	tiempou = (unsigned int)tiempol / 2;
 	_rnd->setSeed(tiempou);
 
-	buffer_teclado();
-
 	color_abc(BLANCO);
 
 	if (hay_sb == 1) {
@@ -556,7 +538,6 @@
 		term_int = 1;
 	if (key != 0)
 		ctvd_stop();
-	buffer_teclado();
 	if (hay_sb == 1) {
 		if (LookForFree() != 0)
 			goto bucless;
@@ -609,9 +590,6 @@
 			suma_1_pixel = 0;
 	}
 
-	if (num_ejec == 2)
-		buffer_teclado();
-
 	if (num_ejec == 4) {
 		if (strcmp(num_room, "24.alg") || flags[29] == 0) {
 			color_abc(AMARILLO);
@@ -707,7 +685,6 @@
 		term_int = 1;
 	if (key != 0)
 		ctvd_stop();
-	buffer_teclado();
 	if (hay_sb == 1) {
 		if (LookForFree() != 0)
 			goto bucless;
@@ -741,8 +718,6 @@
 	tiempou = (unsigned int)tiempol / 2;
 	_rnd->setSeed(tiempou);
 
-	buffer_teclado();
-
 	color_abc(BLANCO);
 
 	if (hay_sb == 1) {
@@ -779,7 +754,6 @@
 	byte key = getscan();
 	if (key != 0)
 		ctvd_stop();
-	buffer_teclado();
 	if (hay_sb == 1) {
 		if (LookForFree() != 0)
 			goto bucless;
@@ -824,8 +798,6 @@
 		goto bebiendo;
 	}
 
-	buffer_teclado();
-
 	color_abc(VERDE_OSCURO);
 
 	if (hay_sb == 1) {
@@ -861,7 +833,6 @@
 	byte key = getscan();
 	if (key != 0)
 		ctvd_stop();
-	buffer_teclado();
 	if (hay_sb == 1) {
 		if (LookForFree() != 0)
 			goto bucless;
@@ -906,8 +877,6 @@
 	tiempou = (unsigned int)tiempol / 2;
 	_rnd->setSeed(tiempou);
 
-	buffer_teclado();
-
 	color_abc(VON_BRAUN);
 
 	if (hay_sb == 1) {
@@ -947,7 +916,6 @@
 	int key = getscan();
 	if (key != 0)
 		ctvd_stop();
-	buffer_teclado();
 	if (hay_sb == 1) {
 		if (LookForFree() != 0)
 			goto bucless;
@@ -977,8 +945,6 @@
 	tiempou = (unsigned int)tiempol / 2;
 	_rnd->setSeed(tiempou);
 
-	buffer_teclado();
-
 	color_abc(VON_BRAUN);
 
 	if (hay_sb == 1) {
@@ -1002,7 +968,6 @@
 	int key = getscan();
 	if (key != 0)
 		ctvd_stop();
-	buffer_teclado();
 	if (hay_sb == 1) {
 		if (LookForFree() != 0)
 			goto bucless;
@@ -1030,8 +995,6 @@
 	int longitud;
 	longitud = strlen(dicho);
 
-	buffer_teclado();
-
 	color_abc(VON_BRAUN);
 
 	copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla);
@@ -1109,7 +1072,6 @@
 	int key = getscan();
 	if (key != 0)
 		ctvd_stop();
-	buffer_teclado();
 	if (hay_sb == 1) {
 		if (LookForFree() != 0)
 			goto bucless;
@@ -1134,8 +1096,6 @@
 	tiempou = (unsigned int)tiempol / 2;
 	_rnd->setSeed(tiempou);
 
-	buffer_teclado();
-
 	copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla);
 	updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
 
@@ -1224,7 +1184,6 @@
 	int key = getscan();
 	if (key != 0)
 		ctvd_stop();
-	buffer_teclado();
 	if (hay_sb == 1) {
 		if (LookForFree() != 0)
 			goto bucless;
@@ -1255,8 +1214,6 @@
 	tiempou = (unsigned int)tiempol / 2;
 	_rnd->setSeed(tiempou);
 
-	buffer_teclado();
-
 	color_abc(BLANCO);
 
 	if (hay_sb == 1) {
@@ -1292,7 +1249,6 @@
 	int key = getscan();
 	if (key != 0)
 		ctvd_stop();
-	buffer_teclado();
 	if (hay_sb == 1) {
 		if (LookForFree() != 0)
 			goto bucless;
@@ -1329,8 +1285,6 @@
 	tiempou = (unsigned int)tiempol / 2;
 	_rnd->setSeed(tiempou);
 
-	buffer_teclado();
-
 	color_abc(AMARILLO);
 
 	if (hay_sb == 1) {
@@ -1366,7 +1320,6 @@
 	int key = getscan();
 	if (key != 0)
 		ctvd_stop();
-	buffer_teclado();
 	if (hay_sb == 1) {
 		if (LookForFree() != 0)
 			goto bucless;
@@ -1401,8 +1354,6 @@
 	tiempou = (unsigned int)tiempol / 2;
 	_rnd->setSeed(tiempou);
 
-	buffer_teclado();
-
 	color_abc(AMARILLO);
 
 	if (hay_sb == 1) {
@@ -1438,7 +1389,6 @@
 	int key = getscan();
 	if (key != 0)
 		ctvd_stop();
-	buffer_teclado();
 	if (hay_sb == 1) {
 		if (LookForFree() != 0)
 			goto bucless;
@@ -1471,8 +1421,6 @@
 	tiempou = (unsigned int)tiempol / 2;
 	_rnd->setSeed(tiempou);
 
-	buffer_teclado();
-
 	color_abc(MARRON);
 
 	if (hay_sb == 1) {
@@ -1508,7 +1456,6 @@
 	int key = getscan();
 	if (key != 0)
 		ctvd_stop();
-	buffer_teclado();
 	if (hay_sb == 1) {
 		if (LookForFree() != 0)
 			goto bucless;
@@ -1539,8 +1486,6 @@
 	tiempou = (unsigned int)tiempol / 2;
 	_rnd->setSeed(tiempou);
 
-	buffer_teclado();
-
 	color_abc(BLANCO);
 
 	if (hay_sb == 1) {
@@ -1577,7 +1522,6 @@
 	int key = getscan();
 	if (key != 0)
 		ctvd_stop();
-	buffer_teclado();
 	if (hay_sb == 1) {
 		if (LookForFree() != 0)
 			goto bucless;
@@ -1608,8 +1552,6 @@
 	tiempou = (unsigned int)tiempol / 2;
 	_rnd->setSeed(tiempou);
 
-	buffer_teclado();
-
 	color_abc(AMARILLO);
 
 	if (hay_sb == 1) {
@@ -1648,7 +1590,6 @@
 	int key = getscan();
 	if (key != 0)
 		ctvd_stop();
-	buffer_teclado();
 	if (hay_sb == 1) {
 		if (LookForFree() != 0)
 			goto bucless;
@@ -1675,8 +1616,6 @@
 	int longitud;
 	longitud = strlen(dicho);
 
-	buffer_teclado();
-
 	color_abc(AMARILLO);
 
 	if (num_ejec == 1) {
@@ -1775,7 +1714,6 @@
 	int key = getscan();
 	if (key != 0)
 		ctvd_stop();
-	buffer_teclado();
 	if (hay_sb == 1) {
 		if (LookForFree() != 0)
 			goto bucless;
@@ -1806,8 +1744,6 @@
 	tiempou = (unsigned int)tiempol / 2;
 	_rnd->setSeed(tiempou);
 
-	buffer_teclado();
-
 	cara_antes = flags[19];
 
 	color_abc(MARRON);
@@ -1843,7 +1779,6 @@
 	int key = getscan();
 	if (key != 0)
 		ctvd_stop();
-	buffer_teclado();
 	if (hay_sb == 1) {
 		if (LookForFree() != 0)
 			goto bucless;
@@ -1872,8 +1807,6 @@
 	tiempou = (unsigned int)tiempol / 2;
 	_rnd->setSeed(tiempou);
 
-	buffer_teclado();
-
 	color_abc(BLANCO);
 
 	if (hay_sb == 1){
@@ -1897,7 +1830,6 @@
 	int key = getscan();
 	if (key != 0)
 		ctvd_stop();
-	buffer_teclado();
 	if (hay_sb == 1) {
 		if (LookForFree() != 0)
 			goto bucless;
@@ -1928,8 +1860,6 @@
 	tiempou = (unsigned int)tiempol / 2;
 	_rnd->setSeed(tiempou);
 
-	buffer_teclado();
-
 	color_abc(BLANCO);
 
 	if (hay_sb == 1) {
@@ -1965,7 +1895,6 @@
 	int key = getscan();
 	if (key != 0)
 		ctvd_stop();
-	buffer_teclado();
 	if (hay_sb == 1) {
 		if (LookForFree() != 0)
 			goto bucless;
@@ -1996,8 +1925,6 @@
 	tiempou = (unsigned int)tiempol / 2;
 	_rnd->setSeed(tiempou);
 
-	buffer_teclado();
-
 	color_abc(BLANCO);
 
 	if (hay_sb == 1){
@@ -2033,7 +1960,6 @@
 	int key = getscan();
 	if (key != 0)
 		ctvd_stop();
-	buffer_teclado();
 	if (hay_sb == 1){
 		if (LookForFree() != 0)
 			goto bucless;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list