Miroirs/eliot
1
0
Fork 0
mirror of git://git.savannah.nongnu.org/eliot.git synced 2025-01-17 06:11:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

- minor dic.h changes

Browse source
This commit is contained in:
Antoine Fraboulet 2005-04-09 19:16:56 +00:00
parent 4f1420ed31
commit ebc689befd
3 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
configure.in
View file

@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
dnl --------------------------------------------------------------
dnl configure.in for Eliot
dnl --------------------------------------------------------------
dnl AC_REVISION($Id: configure.in,v 1.10 2005/04/03 21:12:03 ipkiss Exp $)
dnl AC_REVISION($Id: configure.in,v 1.11 2005/04/09 19:16:56 afrab Exp $)
AC_INIT(eliot, 1.5-cvs)
AC_CONFIG_SRCDIR(wxwin/main.cc)
AM_INIT_AUTOMAKE
@ -42,6 +42,13 @@ if test "${enable_debug}" != "no"; then
dnl CXXFLAGS="${CXXFLAGS} -O0"
fi
dnl Regexp build
AC_ARG_ENABLE(dictools,
[ --enable-dictools build independant dictionary tools (default enabled)])
AM_PROG_LEX
AC_PROG_YACC
AM_CONDITIONAL([BUILD_DICTOOLS], [test "${enable_dictools}" != "no"])
dnl --------------------------------------------------------------
dnl Checks for header files.
dnl --------------------------------------------------------------

8
wxwin/auxframes.cc
View file

@ -16,7 +16,7 @@
/* along with this program; if not, write to the Free Software */
/* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/* $Id: auxframes.cc,v 1.9 2005/04/02 21:21:30 ipkiss Exp $ */
/* $Id: auxframes.cc,v 1.10 2005/04/09 19:16:56 afrab Exp $ */
#include <iostream>
using namespace std;
@ -331,7 +331,7 @@ Plus1Frame::Refresh(refresh_t force)
{
int i, j;
string rack2;
char buff[LETTERS][RES_7PL1_MAX][DIC_WORD_MAX];
char buff[DIC_LETTERS][RES_7PL1_MAX][DIC_WORD_MAX];
rack2 = m_game.getPlayerRack(0);
@ -344,10 +344,10 @@ Plus1Frame::Refresh(refresh_t force)
Dic_search_7pl1(m_game.getDic(), m_rack.c_str(), buff, config.getJokerPlus1());
int resnum = 0;
wxString res[LETTERS*(RES_7PL1_MAX+1)];
wxString res[DIC_LETTERS*(RES_7PL1_MAX+1)];
// wxString(wxT) added for clean compile with wx2.4
res[resnum++] = wxString(wxT("Tirage: ")) + wxString(wxU(m_rack.c_str()));
for (i = 0; i < LETTERS; i++)
for (i = 0; i < DIC_LETTERS; i++)
{
if (i && buff[i][0][0])
res[resnum++] = wxString(wxT("+")) + (wxChar)(i + 'A' - 1);

8
wxwin/searchpanel.cc
View file

@ -16,7 +16,7 @@
/* along with this program; if not, write to the Free Software */
/* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/* $Id: searchpanel.cc,v 1.5 2005/02/05 11:14:56 ipkiss Exp $ */
/* $Id: searchpanel.cc,v 1.6 2005/04/09 19:16:56 afrab Exp $ */
#include <string.h>
#include "wx/panel.h"
@ -162,7 +162,7 @@ PPlus1::compute_enter(wxCommandEvent&)
{
int i,j;
char rack[DIC_WORD_MAX];
char buff[LETTERS][RES_7PL1_MAX][DIC_WORD_MAX];
char buff[DIC_LETTERS][RES_7PL1_MAX][DIC_WORD_MAX];
if (!check())
return;
@ -179,8 +179,8 @@ PPlus1::compute_enter(wxCommandEvent&)
Dic_search_7pl1(dic_,rack,buff,TRUE);
int resnum = 0;
wxString res[LETTERS*(RES_7PL1_MAX+1)];
for(i=0; i < LETTERS; i++)
wxString res[DIC_LETTERS*(RES_7PL1_MAX+1)];
for(i=0; i < DIC_LETTERS; i++)
{
if (i && buff[i][0][0])
res[resnum++] = wxString(wxT("+")) + (wxChar)(i+'A'-1);