[patch] patch for russian translation

3.4.3-russian-unVC2008.patch (text/plain), 10.64 KB, created by Damir Gilyazov on 2009-08-25 21:51:15 UTC

diff -ru nethack-3.4.3-ru.0.3-orig/src/cmd.c nethack-3.4.3-ru.0.3/src/cmd.c
--- nethack-3.4.3-ru.0.3-orig/src/cmd.c	2008-12-15 00:03:00.000000000 +0200
+++ nethack-3.4.3-ru.0.3/src/cmd.c	2009-08-25 23:32:56.000000000 +0300
@@ -161,14 +161,14 @@
 #ifdef OVL1
 
 STATIC_PTR int
-doprev_message(VOID_ARGS)
+doprev_message()
 {
     return nh_doprev_message();
 }
 
 /* Count down by decrementing multi */
 STATIC_PTR int
-timed_occupation(VOID_ARGS)
+timed_occupation()
 {
 	(*timed_occ_fn)();
 	if (multi > 0)
@@ -285,7 +285,7 @@
 #ifdef OVLB
 
 STATIC_PTR int
-doextcmd(VOID_ARGS)	/* here after # - now read a full-word command */
+doextcmd()	/* here after # - now read a full-word command */
 {
 	int idx, retval;
 
@@ -301,7 +301,7 @@
 }
 
 int
-doextlist(VOID_ARGS)	/* here after #? - now list all full-word commands */
+doextlist()	/* here after #? - now list all full-word commands */
 {
 	register const struct ext_func_tab *efp;
 	char	 buf[BUFSZ];
@@ -447,7 +447,7 @@
 
 /* #monster command - use special monster ability while polymorphed */
 STATIC_PTR int
-domonability(VOID_ARGS)
+domonability()
 {
 	if (can_breathe(youmonst.data)) return dobreathe();
 	else if (attacktype(youmonst.data, AT_SPIT)) return dospit();
@@ -477,7 +477,7 @@
 }
 
 STATIC_PTR int
-enter_explore_mode(VOID_ARGS)
+enter_explore_mode()
 {
 	if(!discover && !wizard) {
 		pline("Âíèìàíèå!  Èç èññëåäîâàòåëüñêîãî ðåæèìà íåëüçÿ âåðíóòüñÿ ê íîðìàëüíîé èãðå.");
@@ -498,7 +498,7 @@
 
 /* ^W command - wish for something */
 STATIC_PTR int
-wiz_wish(VOID_ARGS)	/* Unlimited wishes for debug mode by Paul Polderman */
+wiz_wish()	/* Unlimited wishes for debug mode by Paul Polderman */
 {
 	if (wizard) {
 	    boolean save_verbose = flags.verbose;
@@ -514,7 +514,7 @@
 
 /* ^I command - identify hero's inventory */
 STATIC_PTR int
-wiz_identify(VOID_ARGS)
+wiz_identify()
 {
 	if (wizard)	identify_pack(0);
 	else		pline("Êîìàíäà '^I' íåäîñòóïíà.");
@@ -523,7 +523,7 @@
 
 /* ^F command - reveal the level map and any traps on it */
 STATIC_PTR int
-wiz_map(VOID_ARGS)
+wiz_map()
 {
 	if (wizard) {
 	    struct trap *t;
@@ -545,7 +545,7 @@
 
 /* ^G command - generate monster(s); a count prefix will be honored */
 STATIC_PTR int
-wiz_genesis(VOID_ARGS)
+wiz_genesis()
 {
 	if (wizard)	(void) create_particular();
 	else		pline("Êîìàíäà '^G' íåäîñòóïíà.");
@@ -554,7 +554,7 @@
 
 /* ^O command - display dungeon layout */
 STATIC_PTR int
-wiz_where(VOID_ARGS)
+wiz_where()
 {
 	if (wizard) (void) print_dungeon(FALSE, (schar *)0, (xchar *)0);
 	else	    pline("Êîìàíäà '^O' íåäîñòóïíà.");
@@ -563,7 +563,7 @@
 
 /* ^E command - detect unseen (secret doors, traps, hidden monsters) */
 STATIC_PTR int
-wiz_detect(VOID_ARGS)
+wiz_detect()
 {
 	if(wizard)  (void) findit();
 	else	    pline("Êîìàíäà '^E' íåäîñòóïíà.");
@@ -572,7 +572,7 @@
 
 /* ^V command - level teleport */
 STATIC_PTR int
-wiz_level_tele(VOID_ARGS)
+wiz_level_tele()
 {
 	if (wizard)	level_tele();
 	else		pline("Êîìàíäà '^V' íåäîñòóïíà.");
@@ -581,7 +581,7 @@
 
 /* #monpolycontrol command - choose new form for shapechangers, polymorphees */
 STATIC_PTR int
-wiz_mon_polycontrol(VOID_ARGS)
+wiz_mon_polycontrol()
 {
     iflags.mon_polycontrol = !iflags.mon_polycontrol;
     pline("Óïðàâëåíèå îáðàùåíèåì ÷óäîâèùà %s.",
@@ -591,7 +591,7 @@
 
 /* #levelchange command - adjust hero's experience level */
 STATIC_PTR int
-wiz_level_change(VOID_ARGS)
+wiz_level_change()
 {
     char buf[BUFSZ];
     int newlevel;
@@ -631,7 +631,7 @@
 
 /* #panic command - test program's panic handling */
 STATIC_PTR int
-wiz_panic(VOID_ARGS)
+wiz_panic()
 {
 	if (yn("Òû õî÷åøü âûçâàòü panic() è ïðåêðàòèòü èãðó?") == 'y')
 		panic("crash test.");
@@ -640,7 +640,7 @@
 
 /* #polyself command - change hero's form */
 STATIC_PTR int
-wiz_polyself(VOID_ARGS)
+wiz_polyself()
 {
         polyself(TRUE);
         return 0;
@@ -648,7 +648,7 @@
 
 /* #seenv command */
 STATIC_PTR int
-wiz_show_seenv(VOID_ARGS)
+wiz_show_seenv()
 {
 	winid win;
 	int x, y, v, startx, stopx, curx;
@@ -690,7 +690,7 @@
 
 /* #vision command */
 STATIC_PTR int
-wiz_show_vision(VOID_ARGS)
+wiz_show_vision()
 {
 	winid win;
 	int x, y, v;
@@ -727,7 +727,7 @@
 
 /* #wmode command */
 STATIC_PTR int
-wiz_show_wmodes(VOID_ARGS)
+wiz_show_wmodes()
 {
 	winid win;
 	int x,y;
@@ -1232,7 +1232,7 @@
 }
 
 STATIC_PTR int
-doattributes(VOID_ARGS)
+doattributes()
 {
 	if (!minimal_enlightenment())
 		return 0;
@@ -1245,7 +1245,7 @@
  * (shares enlightenment's tense handling)
  */
 STATIC_PTR int
-doconduct(VOID_ARGS)
+doconduct()
 {
 	show_conduct(0);
 	return 0;
@@ -1983,10 +1983,9 @@
 		if (*cmd >= 040 && *cmd < 0177) {
 		    *cp++ = *cmd++;
 		} else if (*cmd & 0200) {
-			char c = *cmd++;
 		    *cp++ = 'M';
 		    *cp++ = '-';
-		    *cp++ = c & ~0200;
+		    *cp++ = *cmd++ &= ~0200;
 		} else {
 		    *cp++ = '^';
 		    *cp++ = *cmd++ ^ 0100;
@@ -2449,7 +2448,7 @@
 }
 
 STATIC_PTR int
-dotravel(VOID_ARGS)
+dotravel()
 {
 	/* Keyboard travel command */
 	static char cmd[2];
diff -ru nethack-3.4.3-ru.0.3-orig/src/dig.c nethack-3.4.3-ru.0.3/src/dig.c
--- nethack-3.4.3-ru.0.3-orig/src/dig.c	2008-12-15 00:03:00.000000000 +0200
+++ nethack-3.4.3-ru.0.3/src/dig.c	2009-08-25 23:28:11.000000000 +0300
@@ -208,7 +208,7 @@
 }
 
 STATIC_OVL int
-dig(VOID_ARGS)
+dig()
 {
 	register struct rm *lev;
 	register xchar dpx = digging.pos.x, dpy = digging.pos.y;
diff -ru nethack-3.4.3-ru.0.3-orig/src/do.c nethack-3.4.3-ru.0.3/src/do.c
--- nethack-3.4.3-ru.0.3-orig/src/do.c	2008-12-15 00:03:00.000000000 +0200
+++ nethack-3.4.3-ru.0.3/src/do.c	2009-08-25 23:26:46.000000000 +0300
@@ -1598,7 +1598,7 @@
 #ifdef OVLB
 
 STATIC_PTR int
-wipeoff(VOID_ARGS)
+wipeoff()
 {
 	if(u.ucreamed < 4)	u.ucreamed = 0;
 	else			u.ucreamed -= 4;
diff -ru nethack-3.4.3-ru.0.3-orig/src/do_wear.c nethack-3.4.3-ru.0.3/src/do_wear.c
--- nethack-3.4.3-ru.0.3-orig/src/do_wear.c	2008-12-15 00:03:00.000000000 +0200
+++ nethack-3.4.3-ru.0.3/src/do_wear.c	2009-08-25 23:27:34.000000000 +0300
@@ -93,7 +93,7 @@
 
 STATIC_PTR
 int
-Boots_on(VOID_ARGS)
+Boots_on()
 {
     long oldprop =
 	u.uprops[objects[uarmf->otyp].oc_oprop].extrinsic & ~WORN_BOOTS;
@@ -140,7 +140,7 @@
 }
 
 int
-Boots_off(VOID_ARGS)
+Boots_off()
 {
     int otyp = uarmf->otyp;
     long oldprop = u.uprops[objects[otyp].oc_oprop].extrinsic & ~WORN_BOOTS;
@@ -195,7 +195,7 @@
 }
 
 STATIC_PTR int
-Cloak_on(VOID_ARGS)
+Cloak_on()
 {
     long oldprop =
 	u.uprops[objects[uarmc->otyp].oc_oprop].extrinsic & ~WORN_CLOAK;
@@ -244,7 +244,7 @@
 }
 
 int
-Cloak_off(VOID_ARGS)
+Cloak_off()
 {
     int otyp = uarmc->otyp;
     long oldprop = u.uprops[objects[otyp].oc_oprop].extrinsic & ~WORN_CLOAK;
@@ -291,7 +291,7 @@
 
 STATIC_PTR
 int
-Helmet_on(VOID_ARGS)
+Helmet_on()
 {
     switch(uarmh->otyp) {
 	case FEDORA:
@@ -348,7 +348,7 @@
 }
 
 int
-Helmet_off(VOID_ARGS)
+Helmet_off()
 {
     takeoff_mask &= ~W_ARMH;
 
@@ -391,7 +391,7 @@
 
 STATIC_PTR
 int
-Gloves_on(VOID_ARGS)
+Gloves_on()
 {
     long oldprop =
 	u.uprops[objects[uarmg->otyp].oc_oprop].extrinsic & ~WORN_GLOVES;
@@ -416,7 +416,7 @@
 }
 
 int
-Gloves_off(VOID_ARGS)
+Gloves_off()
 {
     long oldprop =
 	u.uprops[objects[uarmg->otyp].oc_oprop].extrinsic & ~WORN_GLOVES;
@@ -472,7 +472,7 @@
 }
 
 STATIC_PTR int
-Shield_on(VOID_ARGS)
+Shield_on()
 {
 /*
     switch (uarms->otyp) {
@@ -491,7 +491,7 @@
 }
 
 int
-Shield_off(VOID_ARGS)
+Shield_off()
 {
     takeoff_mask &= ~W_ARMS;
 /*
@@ -513,7 +513,7 @@
 
 #ifdef TOURIST
 STATIC_PTR int
-Shirt_on(VOID_ARGS)
+Shirt_on()
 {
 /*
     switch (uarmu->otyp) {
@@ -527,7 +527,7 @@
 }
 
 int
-Shirt_off(VOID_ARGS)
+Shirt_off()
 {
     takeoff_mask &= ~W_ARMU;
 /*
@@ -549,13 +549,13 @@
  */
 STATIC_PTR
 int
-Armor_on(VOID_ARGS)
+Armor_on()
 {
     return 0;
 }
 
 int
-Armor_off(VOID_ARGS)
+Armor_off()
 {
     takeoff_mask &= ~W_ARM;
     setworn((struct obj *)0, W_ARM);
@@ -1930,7 +1930,7 @@
 
 STATIC_PTR
 int
-take_off(VOID_ARGS)
+take_off()
 {
 	register int i;
 	register struct obj *otmp;
diff -ru nethack-3.4.3-ru.0.3-orig/src/eat.c nethack-3.4.3-ru.0.3/src/eat.c
--- nethack-3.4.3-ru.0.3-orig/src/eat.c	2008-12-15 00:03:00.000000000 +0200
+++ nethack-3.4.3-ru.0.3/src/eat.c	2009-08-25 23:25:46.000000000 +0300
@@ -179,7 +179,7 @@
 
 STATIC_PTR
 int
-eatmdone(VOID_ARGS)		/* called after mimicing is over */
+eatmdone()		/* called after mimicing is over */
 {
 	/* release `eatmbuf' */
 	if (eatmbuf) {
@@ -396,7 +396,7 @@
 
 STATIC_PTR
 int
-eatfood(VOID_ARGS)		/* called each move during eating process */
+eatfood()		/* called each move during eating process */
 {
 	if(!victual.piece ||
 	 (!carried(victual.piece) && !obj_here(victual.piece, u.ux, u.uy))) {
@@ -1014,7 +1014,7 @@
 
 STATIC_PTR
 int
-opentin(VOID_ARGS)		/* called during each move whilst opening a tin */
+opentin()		/* called during each move whilst opening a tin */
 {
 	register int r;
 	const char *what;
@@ -1190,7 +1190,7 @@
 }
 
 int
-Hear_again(VOID_ARGS)		/* called when waking up after fainting */
+Hear_again()		/* called when waking up after fainting */
 {
 	flags.soundok = 1;
 	return 0;
@@ -2223,7 +2223,7 @@
 
 STATIC_PTR
 int
-unfaint(VOID_ARGS)
+unfaint()
 {
 	(void) Hear_again();
 	if(u.uhs > FAINTING)
diff -ru nethack-3.4.3-ru.0.3-orig/src/lock.c nethack-3.4.3-ru.0.3/src/lock.c
--- nethack-3.4.3-ru.0.3-orig/src/lock.c	2008-12-15 00:03:00.000000000 +0200
+++ nethack-3.4.3-ru.0.3/src/lock.c	2009-08-25 23:25:21.000000000 +0300
@@ -74,7 +74,7 @@
 
 STATIC_PTR
 int
-picklock(VOID_ARGS)	/* try to open/close a lock */
+picklock()	/* try to open/close a lock */
 {
 
 	if (xlock.box) {
@@ -129,7 +129,7 @@
 
 STATIC_PTR
 int
-forcelock(VOID_ARGS)	/* try to force a locked chest */
+forcelock()	/* try to force a locked chest */
 {
 
 	register struct obj *otmp;
diff -ru nethack-3.4.3-ru.0.3-orig/src/spell.c nethack-3.4.3-ru.0.3/src/spell.c
--- nethack-3.4.3-ru.0.3-orig/src/spell.c	2008-12-15 00:03:00.000000000 +0200
+++ nethack-3.4.3-ru.0.3/src/spell.c	2009-08-25 23:22:11.000000000 +0300
@@ -314,7 +314,7 @@
 }
 
 STATIC_PTR int
-learn(VOID_ARGS)
+learn()
 {
 	int i;
 	short booktype;
diff -ru nethack-3.4.3-ru.0.3-orig/src/steal.c nethack-3.4.3-ru.0.3/src/steal.c
--- nethack-3.4.3-ru.0.3-orig/src/steal.c	2008-12-15 00:03:00.000000000 +0200
+++ nethack-3.4.3-ru.0.3/src/steal.c	2009-08-25 23:22:58.000000000 +0300
@@ -144,7 +144,7 @@
 unsigned int stealmid;		/* monster doing the stealing */
 
 STATIC_PTR int
-stealarm(VOID_ARGS)
+stealarm()
 {
 	register struct monst *mtmp;
 	register struct obj *otmp;