X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=misc.c;h=93dce3b073b51f87dfcd0192b26a0b15fc2f75ad;hp=1e72ba7cb2bc3dc90460f4d0d2bfbb1ba07fdca0;hb=28583348450b28bd4811d37fa5fe50bcbcfcfb12;hpb=519d8f07e636c3171ad8ce05e729abb0d5b3c4e1 diff --git a/misc.c b/misc.c index 1e72ba7..93dce3b 100644 --- a/misc.c +++ b/misc.c @@ -778,31 +778,33 @@ long randrange(long range) #undef RNDVOC long fRNDVOC(long CHAR, long FORCE) { -long DIV, I, J, RNDVOC; - /* Searches the vocabulary for a word whose second character is char, and * changes that word such that each of the other four characters is a * random letter. If force is non-zero, it is used as the new word. * Returns the new word. */ + long RNDVOC; RNDVOC=FORCE; - if(RNDVOC != 0) goto L3; - for (I=1; I<=5; I++) { - J=11+randrange(26); - if(I == 2)J=CHAR; - RNDVOC=RNDVOC*64+J; - } /* end loop */ -L3: J=10000; - DIV=64L*64L*64L; - for (I=1; I<=TABSIZ; I++) { - J=J+7; - if(MOD((ATAB[I]-J*J)/DIV,64L) == CHAR) goto L8; - /*etc*/ ; - } /* end loop */ - BUG(5); -L8: ATAB[I]=RNDVOC+J*J; + if (RNDVOC == 0) { + for (int I = 1; I <= 5; I++) { + long J = 11 + randrange(26); + if (I == 2) + J = CHAR; + RNDVOC = RNDVOC * 64 + J; + } + } + + long DIV = 64L * 64L * 64L; + for (int I = 1; I <= TABSIZ; I++) { + if (MOD(ATAB[I]/DIV, 64L) == CHAR) + { + ATAB[I] = RNDVOC; + break; + } + } + return(RNDVOC); }