mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r14069) -Fix: silence MSVC 64-bits compile warnings.
This commit is contained in:
parent
e5bdcfaf9e
commit
d986380169
|
@ -367,12 +367,12 @@ FILE *FioFOpenFile(const char *filename, const char *mode, Subdirectory subdir,
|
|||
strcpy(resolved_name, filename);
|
||||
strtolower(resolved_name);
|
||||
|
||||
uint resolved_len = strlen(resolved_name);
|
||||
size_t resolved_len = strlen(resolved_name);
|
||||
|
||||
/* Resolve ONE directory link */
|
||||
for (TarLinkList::iterator link = _tar_linklist.begin(); link != _tar_linklist.end(); link++) {
|
||||
const std::string &src = link->first;
|
||||
uint len = src.length();
|
||||
size_t len = src.length();
|
||||
if (resolved_len >= len && resolved_name[len - 1] == PATHSEPCHAR && strncmp(src.c_str(), resolved_name, len) == 0) {
|
||||
/* Apply link */
|
||||
char resolved_name2[MAX_RESOLVED_LENGTH];
|
||||
|
|
|
@ -1056,7 +1056,7 @@ enum QueryStringWidgets {
|
|||
|
||||
struct QueryStringWindow : public QueryStringBaseWindow
|
||||
{
|
||||
QueryStringWindow(size_t size, const WindowDesc *desc, Window *parent) : QueryStringBaseWindow(size, desc)
|
||||
QueryStringWindow(uint16 size, const WindowDesc *desc, Window *parent) : QueryStringBaseWindow(size, desc)
|
||||
{
|
||||
this->parent = parent;
|
||||
SetBit(_no_scroll, SCROLL_EDIT);
|
||||
|
|
|
@ -39,11 +39,11 @@ struct QueryString {
|
|||
};
|
||||
|
||||
struct QueryStringBaseWindow : public Window, public QueryString {
|
||||
const size_t edit_str_size;
|
||||
char *edit_str_buf;
|
||||
char *orig_str_buf;
|
||||
const uint16 edit_str_size;
|
||||
|
||||
QueryStringBaseWindow(size_t size, const WindowDesc *desc, WindowNumber window_number = 0) : Window(desc, window_number), edit_str_size(size)
|
||||
QueryStringBaseWindow(uint16 size, const WindowDesc *desc, WindowNumber window_number = 0) : Window(desc, window_number), edit_str_size(size)
|
||||
{
|
||||
this->edit_str_buf = CallocT<char>(size);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue