Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-15 15:41:24 +01:00
Code Issues Projects Releases Packages Wiki Activity
5110 commits 21 branches 243 tags 33 MiB
Commit graph

836 commits

Author SHA1 Message Date
Andy2
d856b9a8ce Don't behave badly in presence of empty dict: word count should be 0 
and sanity test should pass.
 2011-11-21 18:06:46 -08:00
Andy2
872ebe68f4 make array one large to hold word whose len is == max 2011-11-18 21:14:24 -08:00
Andy2
21330af568 make tiles array variable sizes. 32*32*2 is too many bytes to use 
when the typical board at 15*15 requires less than 1/4 of that.
 2011-11-18 18:59:59 -08:00
Andy2
cc0105e14c add param to dict_countWords in which it accumulates counts per word 
length.  Shouldn't hurt speed too much if null passed.
 2011-11-18 08:15:21 -08:00
Andy2
598be8b404 MAX_COLS -> MAX_COLS_DICT for dict-related stuff (since dicts are 
staying with fewer words for now.)
 2011-11-18 07:56:02 -08:00
Andy2
2eac8e70e0 adding missing ifdef 2011-11-18 07:43:37 -08:00
Andy2
37e81fd062 use number of bits based on stream version not current build -- 
required in case new code is talking with old in networked game.
 2011-11-18 07:43:10 -08:00
Andy2
f9c3a95603 move stream version definitions 2011-11-18 07:41:57 -08:00
Andy2
4760ceda5a Merge branch 'android_branch' into android_browsedict 
Conflicts:
	xwords4/android/XWords4/jni/anddict.c
 2011-11-17 20:55:02 -08:00
Andy2
210c59ef9b move bonus square values into model: add API to set an array, and API 
to query model for values.  Now everybody else queries new model API
rather than client via util_getSquareBonus(), model uses its internal
values if present otherwise falls back to util_getSquareBonus(), and
internalizes the array as part of the game.  Now it should be easier
to have different bonus patterns and to have them exchanged as part of
network game init.
 2011-11-16 19:01:11 -08:00
Andy2
fab39a5f87 Trying to deal with old- and new-proto devices interacting. Fix 
clients to append their stream version to their inital connect
message.  (The format can't change, so detecting additional length was
the only option.  comm.c on existing clients won't allow more than one
connect message per channel, so adding a new to be used in addition
didn't work.)  New servers detect this; old will ignore.  Track the
version (implicit or not) of all clients, and use the lowest any
supports, so that new server and all new clients will use newer proto.
 2011-11-16 06:47:55 -08:00
Andy2
bdb8e6f03c fix several crashers that prevented network games from working when 
MAX_COLS was larger than 16.  In order that old-style messages on
relay be readable by new-style code on device, modified server.c's
protocol to include stream version.  But: unless I come up with a
better way of doing this all devices will have to be upgraded at the
same time: old won't be able to read the new format as it's done here.
 2011-11-15 06:13:25 -08:00
Andy2
86d5778ec3 remove 16x16 limitation on board size, replacing with 32x32. Change 
is enabled by a compile-time flag so Android needn't follow yet.
 2011-11-14 18:21:41 -08:00
Andy2
dddec50f1d Merge branch 'android_branch' into android_browsedict 
Conflicts:
	xwords4/android/XWords4/jni/Android.mk
	xwords4/linux/Makefile
	xwords4/linux/linuxmain.c
 2011-11-10 19:22:57 -08:00
Eric House
619c25ee49 add a bit of logging to help deciphering test app problems. 2011-11-10 18:28:11 -08:00
Eric House
cee738942e back out earlier change using redo: it was broken. Add assert to 
catch problem with passing ptr to tiles as src of tiles.
 2011-11-10 18:26:32 -08:00
Eric House
6d98631640 sanity check: make sure tiles are within range. 2011-11-10 18:24:45 -08:00
eehouse@eehouse.org
9f22b11f81 Merge remote branch 'origin/android_branch' into android_branch 2011-11-10 06:54:42 -08:00
Andy2
43a79a0b47 use undo/redo rather than copying stack to figure past move score. 
This may have been contributing to crashes, but the new code's more
effecient anyway.
 2011-11-10 06:52:33 -08:00
Andy2
645695e358 improve logging, and fix mistyped variable found by inspection rather 
because of a problem.
 2011-11-10 06:41:07 -08:00
Andy2
b9a7574925 fix emacs header comments; no code change 2011-11-10 06:39:36 -08:00
Andy2
af5c8a096f don't pass a pointer to a tray inside the model to model code that 
will modify that tray!  Fixes nasty random crash/assertion failure.
 2011-11-10 06:35:05 -08:00
Eric House
268f018140 add dict sanity check that will, I hope, catch corrupt dicts. 2011-11-09 06:51:12 -08:00
Andy2
3707e7aaca tweak to get performance to same level as before length-filtering was 
added, mostly by using local variables instead of ptr-accessed in
struct and macro magic to support that.  Passes every test I can think
of on Linux but fast-scrolling broken on Android.
 2011-11-05 06:14:35 -07:00
Andy2
da02e994b7 protext min,max with compile-time flag 2011-11-04 06:16:44 -07:00
Eric House
a2319a8073 experimental additions, mostly compile-time disable-able, so prune 
dict by wordlen.
 2011-11-03 21:25:51 -07:00
Andy2
627410250f reuse existing code in dict_countWords() 2011-11-03 06:18:53 -07:00
Andy2
5c995af38c stop changing formats between internal and external structs 
(iterators); use internal format all the time for speed.  Update linux
test code for new API.
 2011-11-02 18:32:00 -07:00
Andy2
38867b2875 fix bug in debug free following debug realloc to smaller size 2011-11-02 04:38:39 -07:00
Andy2
eb2b139e48 add some consts and better test for null index data 2011-11-01 18:47:20 -07:00
Andy2
fc4a5c31f4 silence picky compiler 2011-10-31 21:11:52 -07:00
Andy2
0d4404d43b add dict_getStartsWith(), and code to test it. Lots of cleanup and 
bugfixing of dictiter code as well.
 2011-10-31 21:05:34 -07:00
Andy2
88f556356c dict_tileForString -> dict_tilesForString 2011-10-31 20:56:48 -07:00
Andy2
69b1b4da27 break dict iteration stuff out into new files. No code change 
otherwise.
 2011-10-31 18:30:55 -07:00
Andy2
1d34c26ebc remove unneeded parama 2011-10-31 06:37:53 -07:00
Andy2
dc58d123d5 combine params into single struct 2011-10-31 06:34:21 -07:00
Andy2
8d228ae190 turn on face-up tile picking for Android (though there's no prefs UI 
to enable it for a game yet).  In common code, break pick tile utils
method in two, one for blank and the other for tray tiles.  In java,
implement dialog for picking the tiles.  Works, though is a bit clumsy
to have the dialog come and go after every pick.  Better would be a
dialog that stays up and accumulates picks -- but it'd have to know to
reduce the set of tile choices as letters are chosen.  This'll do for
now.
 2011-10-28 22:15:56 -07:00
Eric House
f6ff3e85c6 Merge remote branch 'origin/android_branch' into android_branch 
Conflicts:
	xwords4/common/dictnry.c
	xwords4/common/dictnry.h
	xwords4/linux/linuxmain.c
 2011-10-28 20:54:55 -07:00
Eric House
71450b02b3 use indexing (and add binary search) to double speed of getNthWord 2011-10-28 20:27:16 -07:00
Eric House
42d1a48a1d don't include indices for prefixes that don't exist. 2011-10-26 22:25:21 -07:00
Eric House
412a58f6b9 make dict_makeIndex work for depth > 1. 2011-10-26 22:20:21 -07:00
Eric House
f2c4e39cd4 add dict_makeIndex(). Works, but only for depth==1 so far (A, not AA or AAA). 2011-10-26 07:10:50 -07:00
Andy2
fc973079dc add first cut at dict_getNthWord. Works. Is slow. 2011-10-25 06:48:16 -07:00
Andy2
ac214236c4 add code to walk dict backwards as well, and test code that 
succesfully walks huge dicts in both directions turning out the same
list of words either way.  Still compile-time disabled.
 2011-10-24 18:27:16 -07:00
Andy2
7c7cd82e0a add code to iterate over words in a dict. Works on Linux (iterating 
forward only) but disabled at compile time.  Idea's to have a dict
browser.  There was some simple refactoring in common code Android
uses, and that tests fine.
 2011-10-21 18:51:33 -07:00
Andy2
4eee7f8aa7 Pass selected tiles into new util function, and from there into java 
world, so confirming query can include them.
 2011-10-19 18:34:26 -07:00
Andy2
c2a7a5c347 fix crash: don't destroy stream if for some reason it's null. Not 
sure how that happens, but it does.
 2011-10-18 21:29:40 -07:00
Andy2
652b7e703a Remove difference between debug- and non-debug stream format. 2011-10-18 21:27:28 -07:00
Andy2
b31e829414 Remove file-format differences between debug and non-debug versions. 
Fix curses to compile non-debug.
 2011-10-18 18:52:37 -07:00
Andy2
235259ef45 a bit more tuning of model_listWordsThrough()... 2011-10-17 18:26:04 -07:00